enable low level debug and boot_params offset 0x88000

diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig
index 451e597dfc0b154ec413ec0fb075b14f3803bb97..37461131f51bd93a9def97aa14f2e206900cd79f 100644 (file)
--- 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 b1c79179d4eed0ba7a43a3866d3ad9df8dbc97c1..ef8765631d2448bc5a2f4827c691cdedde3da1ce 100644 (file)
--- 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 62b627302b2ad805eba5e906ccf912fd45385f5f..26a360585888036fb8f56374dda268b3c8bddb21 100644 (file)
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -68,8 +68,8 @@ MACHINE_START(RK29, "RK29board")
 \r
 /* UART for LL DEBUG */\r
        .phys_io        = RK29_UART1_PHYS, \r
-       .io_pg_offst    = ((RK29_ADDR_BASE0) >> 18) & 0xfffc,\r
-       .boot_params    = RK29_SDRAM_PHYS + 0xf8000,\r
+       .io_pg_offst    = ((RK29_UART1_BASE) >> 18) & 0xfffc,\r
+       .boot_params    = RK29_SDRAM_PHYS + 0x88000,\r
        .map_io         = machine_rk29_mapio,\r
        .init_irq       = machine_rk29_init_irq,\r
        .init_machine   = machine_rk29_board_init,\r