From 76cdfd6226c624f11e2271dbd980155356b73530 Mon Sep 17 00:00:00 2001 From: lhh Date: Thu, 21 Oct 2010 21:39:31 +0800 Subject: [PATCH] enable low level debug and boot_params offset 0x88000 --- arch/arm/configs/rk29_sdk_defconfig | 3 ++- arch/arm/mach-rk29/Makefile.boot | 2 +- arch/arm/mach-rk29/board-rk29sdk.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig index 451e597dfc0b..37461131f51b 100644 --- a/arch/arm/configs/rk29_sdk_defconfig +++ b/arch/arm/configs/rk29_sdk_defconfig @@ -225,6 +225,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=5 # CONFIG_ARM_ERRATA_430973 is not set # CONFIG_ARM_ERRATA_458693 is not set # CONFIG_ARM_ERRATA_460075 is not set +CONFIG_ARM_GIC=y # # Bus support @@ -822,7 +823,7 @@ CONFIG_ARM_UNWIND=y CONFIG_DEBUG_ERRORS=y # CONFIG_DEBUG_STACK_USAGE is not set CONFIG_DEBUG_LL=y -CONFIG_DEBUG_ICEDCC=y +# CONFIG_DEBUG_ICEDCC is not set # # Security options diff --git a/arch/arm/mach-rk29/Makefile.boot b/arch/arm/mach-rk29/Makefile.boot index b1c79179d4ee..ef8765631d24 100644 --- a/arch/arm/mach-rk29/Makefile.boot +++ b/arch/arm/mach-rk29/Makefile.boot @@ -1,3 +1,3 @@ zreladdr-y := 0x60408000 -params_phys-y := 0x600f8000 +params_phys-y := 0x60088000 initrd_phys-y := 0x60800000 diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c index 62b627302b2a..26a360585888 100644 --- a/arch/arm/mach-rk29/board-rk29sdk.c +++ b/arch/arm/mach-rk29/board-rk29sdk.c @@ -68,8 +68,8 @@ MACHINE_START(RK29, "RK29board") /* UART for LL DEBUG */ .phys_io = RK29_UART1_PHYS, - .io_pg_offst = ((RK29_ADDR_BASE0) >> 18) & 0xfffc, - .boot_params = RK29_SDRAM_PHYS + 0xf8000, + .io_pg_offst = ((RK29_UART1_BASE) >> 18) & 0xfffc, + .boot_params = RK29_SDRAM_PHYS + 0x88000, .map_io = machine_rk29_mapio, .init_irq = machine_rk29_init_irq, .init_machine = machine_rk29_board_init, -- 2.34.1