:: [maemo-leste] [PATCH 03/11] Nokia R…
Top Pagina
Delete this message
Reply to this message
Auteur: Pali Rohár
Datum:  
Aan: u-boot
CC: Tom Rini, Simon Glass, Adam Ford, Tony Lindgren, Merlijn Wajer, Arthur D., Pavel Machek, Ivaylo Dimitrov, maemo-leste
Oude Onderwerpen: [maemo-leste] [PATCH 00/11] Fixes for Nokia RX-51
Onderwerp: [maemo-leste] [PATCH 03/11] Nokia RX-51: Move comment about CONFIG_SYS_TEXT_BASE to correct place
In commit commit 278b90ce786f ("configs: Migrate CONFIG_SYS_TEXT_BASE") was
moved definition for CONFIG_SYS_TEXT_BASE option but author probably forgot
to move also comment for lines which are moving. So do it now!

Signed-off-by: Pali Rohár <pali@???>
---
 board/nokia/rx51/lowlevel_init.S | 9 ++++++++-
 include/configs/nokia_rx51.h     | 6 ------
 2 files changed, 8 insertions(+), 7 deletions(-)


diff --git a/board/nokia/rx51/lowlevel_init.S b/board/nokia/rx51/lowlevel_init.S
index 7b1e50d9bc..1466d976fc 100644
--- a/board/nokia/rx51/lowlevel_init.S
+++ b/board/nokia/rx51/lowlevel_init.S
@@ -155,7 +155,14 @@ copy_code_end:
     mov    pc, r2



-/* Copy u-boot to address CONFIG_SYS_TEXT_BASE */
+/*
+ * Copy u-boot to address CONFIG_SYS_TEXT_BASE
+ *
+ * Nokia X-Loader loading secondary image to address 0x80400000
+ * NOLO loading boot image to random place, so it doesn't really
+ * matter what is set in CONFIG_SYS_TEXT_BASE. We have to copy
+ * u-boot to CONFIG_SYS_TEXT_BASE address.
+ */

 copy_uboot_start:
     /* r0 - start of u-boot before */
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index d2cafb0a8b..858951ccf2 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -25,12 +25,6 @@


 #define CONFIG_MACH_TYPE        MACH_TYPE_NOKIA_RX51


-/*
- * Nokia X-Loader loading secondary image to address 0x80400000
- * NOLO loading boot image to random place, so it doesn't really
- * matter what we set this to. We have to copy u-boot to this address
- */
-
 #include <asm/arch/cpu.h>        /* get chip and board defs */
 #include <asm/arch/omap.h>
 #include <asm/arch/mem.h>
-- 
2.20.1