make u-boot a bit easier for newcomers to port.
v2 cover make u-boot a bit easier for newcomers to port.
-- V1
After learning a bit about u-boot I created this series of patches that I thought would help people port u-boot in the future. Patches range from adding documentation for things that weren't immediately obvious to me, up to checking to make sure that values that are essential to booting the kernel are at least written to once and haven't been forgotten.
-- V2
Mostly the same.
Now using defines, rather than hard coded constants. Whitespace corrections.
Documentation more clear.
Christopher Harvey (4):
Added documentation for CONFIG_SYS_TEXT_BASE. Don't compile in large memory test function by default.
ARM: Warn when the machine ID isn't set. Removed unused define, CONFIG_ARMV7.
README | 6 ++++++ arch/arm/include/asm/u-boot.h | 2 ++ arch/arm/lib/board.c | 1 + arch/arm/lib/bootm.c | 6 ++++++ common/cmd_mem.c | 5 +++++ include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/ca9x4_ct_vxp.h | 3 --- include/configs/cm_t35.h | 1 - include/configs/devkit8000.h | 1 - include/configs/dig297.h | 1 - include/configs/igep0020.h | 1 - include/configs/igep0030.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap3_pandora.h | 1 - include/configs/omap3_sdp3430.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omap3_zoom2.h | 1 - include/configs/omap4_panda.h | 1 - include/configs/omap4_sdp4430.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/s5pc210_universal.h | 1 - include/configs/smdkc100.h | 1 - include/configs/smdkv310.h | 1 - 26 files changed, 20 insertions(+), 23 deletions(-)
Signature · 1 line
1.7.3.4
PATCH v2 1/4 Added documentation for CONFIG_SYS_TEXT_BASE.
---
V2:
Make it clear that this is the start address of u-boot.
README | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
README +6 -0
@@ -2366,6 +2366,12 @@ Configuration Settings: - CONFIG_SYS_SDRAM_BASE: Physical start address of SDRAM. _Must_ be 0 here. +- CONFIG_SYS_TEXT_BASE: + Is the start address of the u-boot code. + This value can be in ROM space since u-boot can startup from + within ROM. This value has nothing to do with the relocation + destination in RAM. + - CONFIG_SYS_MBIO_BASE: Physical start address of Motherboard I/O (if using a Cogent motherboard)
Signature · 1 line
1.7.3.4
PATCH v2 1/4 Added documentation for CONFIG_SYS_TEXT_BASE.
Hi Christopher,
Le 07/07/2011 16:26, Christopher Harvey a ?crit :
Quoted 15 lines
Signed-off-by Christopher Harvey<[email protected]>---
V2:
Make it clear that this is the start address of u-boot.README | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)README +0
-0@@ -2366,6 +2366,12 @@ Configuration Settings: - CONFIG_SYS_SDRAM_BASE: Physical start address of SDRAM. _Must_ be 0 here.
README Configuration Settings: · line 2377
Quoted 10 lines
README +6
-0+- CONFIG_SYS_TEXT_BASE: + Is the start address of the u-boot code. + This value can be in ROM space since u-boot can startup from + within ROM. This value has nothing to do with the relocation + destination in RAM. + - CONFIG_SYS_MBIO_BASE: Physical start address of Motherboard I/O (if using a Cogent motherboard)
Applied to u-boot-arm/master (with 3 trailing whitespaces fixed), thanks!
Amicalement,
Signature · 1 line
Albert.
PATCH v2 1/4 Added documentation for CONFIG_SYS_TEXT_BASE.
Quoted 31 lines · Albert ARIBAUD
Hi Christopher,
Le 07/07/2011 16:26, Christopher Harvey a ?crit :
Quoted 15 lines
Signed-off-by Christopher Harvey<[email protected]>---
V2:
Make it clear that this is the start address of u-boot.README | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)README +0
-0@@ -2366,6 +2366,12 @@ Configuration Settings: - CONFIG_SYS_SDRAM_BASE: Physical start address of SDRAM. _Must_ be 0 here.README Configuration Settings: · line 2377
Quoted 10 lines
README +6
-0+- CONFIG_SYS_TEXT_BASE: + Is the start address of the u-boot code. + This value can be in ROM space since u-boot can startup from + within ROM. This value has nothing to do with the relocation + destination in RAM. + - CONFIG_SYS_MBIO_BASE: Physical start address of Motherboard I/O (if using a Cogent motherboard)Applied to u-boot-arm/master (with 3 trailing whitespaces fixed), thanks!
Quoted 3 lines
Amicalement,
Signature · 1 line
Albert.
I'm curious, this one never went in. I'd like to know if I'm not understanding CONFIG_SYS_TEXT_BASE completely.
thanks.
PATCH v2 1/4 Added documentation for CONFIG_SYS_TEXT_BASE.
Dear Christopher Harvey,
Quoted 12 lines · In message <[email protected]> you wrote:
Quoted 12 lines
README Configuration Settings: · line 2377
Quoted 10 lines
+-
CONFIG_SYS_TEXT_BASE:README +5
-0+ Is the start address of the u-boot code. + This value can be in ROM space since u-boot can startup from + within ROM. This value has nothing to do with the relocation + destination in RAM. + - CONFIG_SYS_MBIO_BASE: Physical start address of Motherboard I/O (if using a Cogent motherboard)Applied to u-boot-arm/master (with 3 trailing whitespaces fixed), thanks!
...
Quoted 2 lines
I'm curious, this one never went in. I'd like to know if I'm not understanding
CONFIG_SYS_TEXT_BASEcompletely.
I can't see it in Albert's u-boot-arm/master branch, either.
...and the text is actually wrong.
What is the "start address"? I would say that "_start" defines the start address, i. e. the entry point into the U-Boot code where the CPU starts execution after a reset. But this is on most systems NOT CONFIG_SYS_TEXT_BASE. CONFIG_SYS_TEXT_BASE is the start address of the text segment. - as the name suggests.
Guess that should be fixed...
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de The only time the world beats a path to your door is when you are in the bathroom.
PATCH v2 2/4 Don't compile in large memory test function by default.
In reply to Christopher Harvey---
V2:
I didn't receive comments on this one. By not compiling this by default it removes a couple of #defines people need to think about. Also, I'm guessing the memory test isn't used very much, so this makes u-boot a bit smaller.
common/cmd_mem.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
common/cmd_mem.c +5 -0
@@ -610,6 +610,8 @@ int do_mem_loopw (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }#endif /* CONFIG_LOOPW */ +#ifdef CONFIG_CMD_MTEST +/* * Perform a memory test. A more complete alternative test can be * configured using CONFIG_SYS_ALT_MEMTEST. The complete test loops until
@@ -965,6 +967,7 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; /* not reached */ } +#endif /* CONFIG_CMD_MTEST */ /* Modify memory. *
@@ -1245,11 +1248,13 @@ U_BOOT_CMD( );#endif /* CONFIG_LOOPW */ +#ifdef CONFIG_CMD_MTEST U_BOOT_CMD ( mtest,5 ,1 , do_mem_mtest,"simple RAM read/write test" ,"[start [end [pattern [iterations]]]]" ); +#endif /* CONFIG_CMD_MTEST */ #ifdef CONFIG_MX_CYCLIC U_BOOT_CMD(
Signature · 1 line
1.7.3.4
PATCH v2 2/4 Don't compile in large memory test function by default.
Hi Christopher,
Le 07/07/2011 16:31, Christopher Harvey a ?crit :
Quoted 37 lines
Signed-off-by Christopher Harvey<[email protected]>---
V2:
I didn't receive comments on this one. By not compiling this by default it removes a couple of #defines people need to think about. Also, I'm guessing the memory test isn't used very much, so this makes u-boot a bit smaller.common/cmd_mem.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)common/cmd_mem.c +3
-0@@ -610,6 +610,8 @@ int do_mem_loopw (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }#endif /* CONFIG_LOOPW */ +#ifdef CONFIG_CMD_MTEST +/* * Perform a memory test. A more complete alternative test can be * configured using CONFIG_SYS_ALT_MEMTEST. The complete test loops until @@ -965,6 +967,7 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; /* not reached */ } +#endif /* CONFIG_CMD_MTEST */ /* Modify memory. * @@ -1245,11 +1248,13 @@ U_BOOT_CMD( );#endif /* CONFIG_LOOPW */
common/cmd_mem.c U_BOOT_CMD( · line 1260
Quoted 10 lines
common/cmd_mem.c +2
-0+#ifdef CONFIG_CMD_MTEST U_BOOT_CMD ( mtest,5 ,1 , do_mem_mtest,"simple RAM read/write test" ,"[start [end [pattern [iterations]]]]" ); +#endif /* CONFIG_CMD_MTEST */ #ifdef CONFIG_MX_CYCLIC U_BOOT_CMD(
Applied to u-boot-arm/master, thanks!
Amicalement,
Signature · 1 line
Albert.
PATCH v2 2/4 Don't compile in large memory test function by default.
Dear Albert ARIBAUD,
Quoted 5 lines · In message <[email protected]> you wrote:
Quoted 5 lines
I didn't receive comments on this one. By not compiling this by default it removes a couple of #defines people need to think about. Also, I'm guessing the memory test isn't used very much, so this makes u-boot a bit smaller.
...
Quoted 2 lines
Quoted 2 lines
common/cmd_mem.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
...
Quoted 1 line
Applied to u-boot-arm/master, thanks!
Argh..
This is NOT an ARM specific patch.
Even worse, it changes global behaviour for most baords. This cannot be dones easily.
Sorry, but NAK.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de What is wanted is not the will to believe, but the will to find out, which is the exact opposite. -- Bertrand Russell, "Skeptical Essays", 1928
PATCH v2 2/4 Don't compile in large memory test function by default.
Quoted 14 lines · Wolfgang Denk
Dear Albert ARIBAUD,
Quoted 5 lines · In message<[email protected]> you wrote:
Quoted 5 lines
I didn't receive comments on this one. By not compiling this by default it removes a couple of #defines people need to think about. Also, I'm guessing the memory test isn't used very much, so this makes u-boot a bit smaller.
...
Quoted 2 lines
Quoted 2 lines
common/cmd_mem.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)...
Quoted 1 line
Applied to u-boot-arm/master, thanks!
Quoted 8 lines
Argh..
This is NOT an ARM specific patch.
Even worse, it changes global behaviour for most baords. This cannot be dones easily.
Sorry, but NAK.
Quite understandable, as I hurriedly applied the entire four-patch set when I should only have pulled the last two, ARM-related, patches.
Quoted 3 lines
Best regards,
Wolfgang Denk
Amicalement,
Signature · 1 line
Albert.
PATCH v2 2/4 Don't compile in large memory test function by default.
In reply to Christopher HarveyDear Christopher Harvey,
Quoted 14 lines · In message <[email protected]> you wrote:
I didn't receive comments on this one. By not compiling this by default it removes a couple of #defines people need to think about. Also, I'm guessing the memory test isn't used very much, so this makes u-boot a bit smaller.
common/cmd_mem.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)common/cmd_mem.c +0
-0
common/cmd_mem.c int do_mem_loopw (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 613
Quoted 4 lines
common/cmd_mem.c +1
-0@@ -610,6 +610,8 @@ int do_mem_loopw (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }#endif /* CONFIG_LOOPW */ +#ifdef CONFIG_CMD_MTEST
Formal complaint: ifh you introduce new CONFIG_ options, you MUST document these in the README.
What is worse is that your commit changes global behaviour of U-Boot for all architectures, nearly all boards.
Even if you guess that some feature might not be used we cannot simply remove it lightly.
If you want to make this configurable, then as an opt-out, but not mandatory for everybody.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de If only God would give me some clear sign! Like making a large depo- sit in my name at a Swiss Bank. - Woody Allen
PATCH v2 3/4 ARM: Warn when the machine ID isn't set.
In reply to Christopher HarveyLinux cannot boot without it.
---
V2:
Used a #define instead of a constant.
Used a printf instead of a debug.
arch/arm/include/asm/u-boot.h | 2 ++ arch/arm/lib/board.c | 1 + arch/arm/lib/bootm.c | 6 ++++++ 3 files changed, 9 insertions(+), 0 deletions(-)
arch/arm/include/asm/u-boot.h +2 -0
@@ -48,4 +48,6 @@ typedef struct bd_info { } bi_dram[CONFIG_NR_DRAM_BANKS]; } bd_t; +#define BI_ARCH_NUMBER_INVALID 0xffffffff +#endif /* _U_BOOT_H_ */
arch/arm/lib/board.c +1 -0
@@ -404,6 +404,7 @@ void board_init_f (ulong bootflag)post_bootmode_init ();post_run (NULL ,POST_ROM |post_bootmode_get (0 ));#endif + gd->bd->bi_arch_number =BI_ARCH_NUMBER_INVALID ; gd->bd->bi_baudrate = gd->baudrate;/* Ram ist board specific, so move it to board code ... */
arch/arm/lib/bootm.c +6 -0
@@ -113,6 +113,12 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf ("Using machid 0x%x from environment\n" , machid); } +#ifdef DEBUG +if (machid ==BI_ARCH_NUMBER_INVALID ) { +printf ("Warning: machid not set.\n" ); + } +#endif +show_boot_progress (15 );#ifdef CONFIG_OF_LIBFDT
Signature · 1 line
1.7.3.4
PATCH v2 3/4 ARM: Warn when the machine ID isn't set.
Quoted 42 lines · Christopher Harvey
Linux cannot boot without it.
Signed-off-by Christopher Harvey <[email protected]>---
V2:
Used a #define instead of a constant.
Used a printf instead of a debug.arch/arm/include/asm/u-boot.h | 2 ++ arch/arm/lib/board.c | 1 + arch/arm/lib/bootm.c | 6 ++++++ 3 files changed, 9 insertions(+), 0 deletions(-)arch/arm/include/asm/u-boot.h +2
-0@@ -48,4 +48,6 @@ typedef struct bd_info { } bi_dram[CONFIG_NR_DRAM_BANKS]; } bd_t; +#define BI_ARCH_NUMBER_INVALID 0xffffffff +#endif /* _U_BOOT_H_ */ arch/arm/lib/board.c +1
-0@@ -404,6 +404,7 @@ void board_init_f (ulong bootflag)post_bootmode_init ();post_run (NULL ,POST_ROM |post_bootmode_get (0 ));#endif + gd->bd->bi_arch_number =BI_ARCH_NUMBER_INVALID ; gd->bd->bi_baudrate = gd->baudrate;/* Ram ist board specific, so move it to board code ... */ arch/arm/lib/bootm.c +0
-0
arch/arm/lib/bootm.c int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) · line 120
Quoted 8 lines
arch/arm/lib/bootm.c +5
-0@@ -113,6 +113,12 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf ("Using machid 0x%x from environment\n" , machid); } +#ifdef DEBUG +if (machid ==BI_ARCH_NUMBER_INVALID ) { +printf ("Warning: machid not set.\n" ); + } +#endif
You don't need the curly brackets.
Again, is it essential to enclose that check in ifdef DEBUG?
Signature · 2 lines
Regards, Igor.
PATCH v2 3/4 ARM: Warn when the machine ID isn't set.
Quoted 24 lines · Igor Grinberg
Quoted 22 lines · Christopher Harvey
Linux cannot boot without it.
Signed-off-by Christopher Harvey <[email protected]>---
V2:
Used a #define instead of a constant.
Used a printf instead of a debug.arch/arm/include/asm/u-boot.h | 2 ++ arch/arm/lib/board.c | 1 + arch/arm/lib/bootm.c | 6 ++++++ 3 files changed, 9 insertions(+), 0 deletions(-)arch/arm/include/asm/u-boot.h +0
-0@@ -48,4 +48,6 @@ typedef struct bd_info { } bi_dram[CONFIG_NR_DRAM_BANKS ]; } bd_t;
Quoted 12 lines
arch/arm/lib/board.c void board_init_f (ulong bootflag) · line 407
Quoted 12 lines
arch/arm/include/asm/u-boot.h +2
-0+#define BI_ARCH_NUMBER_INVALID 0xffffffff +#endif /* _U_BOOT_H_ */ arch/arm/lib/board.c +1
-0@@ -404,6 +404,7 @@ void board_init_f (ulong bootflag)post_bootmode_init ();post_run (NULL ,POST_ROM |post_bootmode_get (0 ));#endif + gd->bd->bi_arch_number =BI_ARCH_NUMBER_INVALID ;
I went through the board files and found that several boards set the bi_arch_number in board_early_init_f() and checkboard() functions. This means, that by adding the above, you will break them (override the setting).
IMO, you should move this up just before the init_sequence[] array is executed.
And a small nitpick: there is a trailing white space...
Quoted 21 lines
Quoted 8 lines
arch/arm/lib/board.c +0
-0gd->bd->bi_baudrate = gd->baudrate;/* Ram ist board specific, so move it to board code ... */ arch/arm/lib/bootm.c +0
-0arch/arm/lib/bootm.c int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) · line 120
Quoted 8 lines
arch/arm/lib/bootm.c +5
-0@@ -113,6 +113,12 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf ("Using machid 0x%x from environment\n" , machid); } +#ifdef DEBUG +if (machid ==BI_ARCH_NUMBER_INVALID ) { +printf ("Warning: machid not set.\n" ); + } +#endif You don't need the curly brackets.
Again, is it essential to enclose that check in ifdef DEBUG?
Signature · 2 lines
Regards, Igor.
PATCH v3 3/4 ARM: Warn when the machine ID isn't set.
In reply to Christopher HarveyLinux cannot boot without it.
---
V2:
Used a #define instead of a constant.
Used a printf instead of a debug.
---
V3:
Moved gd->bd->bi_arch_number = BI_ARCH_NUMBER_INVALID; before the
init_sequence loop, so it doesn't overwrite existing values.
Removed unneeded braces.
Reminder, in V2 of this series there are 3 uncommited patches that
have no comments.
arch/arm/include/asm/u-boot.h | 2 ++ arch/arm/lib/board.c | 2 ++ arch/arm/lib/bootm.c | 5 +++++ 3 files changed, 9 insertions(+), 0 deletions(-)
arch/arm/include/asm/u-boot.h +2 -0
@@ -48,4 +48,6 @@ typedef struct bd_info { } bi_dram[CONFIG_NR_DRAM_BANKS]; } bd_t; +#define BI_ARCH_NUMBER_INVALID 0xffffffff +#endif /* _U_BOOT_H_ */
arch/arm/lib/board.c +2 -0
@@ -281,6 +281,8 @@ void board_init_f (ulong bootflag) gd->mon_len = _bss_end_ofs; + gd->bd->bi_arch_number =BI_ARCH_NUMBER_INVALID ; +for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {if ((*init_fnc_ptr)() !=0 ) {hang ();
arch/arm/lib/bootm.c +5 -0
@@ -113,6 +113,11 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf ("Using machid 0x%x from environment\n" , machid); } +#ifdef DEBUG +if (machid ==BI_ARCH_NUMBER_INVALID ) +printf ("Warning: machid not set.\n" ); +#endif +show_boot_progress (15 );#ifdef CONFIG_OF_LIBFDT
Signature · 1 line
1.7.3.4
PATCH v3 3/4 ARM: Warn when the machine ID isn't set.
Hi Christopher,
Quoted 9 lines · Christopher Harvey
Linux cannot boot without it.
Signed-off-by Christopher Harvey <[email protected]>---
V2:
Used a #define instead of a constant.
Used a printf instead of a debug.
Quoted 6 lines
---
V3:
Movedgd->bd->bi_arch_number=BI_ARCH_NUMBER_INVALID; before the
init_sequenceloop, so it doesn't overwrite existing values.
Removed unneeded braces.
This one looks fine, except that you keep ignoring my question... Please, see below
Quoted 37 lines
Reminder, in V2 of this series there are 3 uncommited patches that
have no comments.arch/arm/include/asm/u-boot.h | 2 ++ arch/arm/lib/board.c | 2 ++ arch/arm/lib/bootm.c | 5 +++++ 3 files changed, 9 insertions(+), 0 deletions(-)arch/arm/include/asm/u-boot.h +2
-0@@ -48,4 +48,6 @@ typedef struct bd_info { } bi_dram[CONFIG_NR_DRAM_BANKS]; } bd_t; +#define BI_ARCH_NUMBER_INVALID 0xffffffff +#endif /* _U_BOOT_H_ */ arch/arm/lib/board.c +2
-0@@ -281,6 +281,8 @@ void board_init_f (ulong bootflag) gd->mon_len = _bss_end_ofs; + gd->bd->bi_arch_number =BI_ARCH_NUMBER_INVALID ; +for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {if ((*init_fnc_ptr)() !=0 ) {hang ();arch/arm/lib/bootm.c +0
-0
arch/arm/lib/bootm.c int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) · line 120
Quoted 8 lines
arch/arm/lib/bootm.c +5
-0@@ -113,6 +113,11 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf ("Using machid 0x%x from environment\n" , machid); } +#ifdef DEBUG +if (machid ==BI_ARCH_NUMBER_INVALID ) +printf ("Warning: machid not set.\n" ); +#endif +
Is it essential to enclose that check in #ifdef DEBUG? IMHO, it can be useful also with no DEBUG defined, so I'd add it without the #ifdef DEBUG.
Also, in the printf line, you are mixing tabs with spaces (sorry for not noticing this in previous versions...).
Signature · 2 lines
Regards, Igor.
PATCH v3 3/4 ARM: Warn when the machine ID isn't set.
Quoted 10 lines · Igor Grinberg
arch/arm/lib/bootm.c int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) · line 120
Quoted 5 lines
arch/arm/lib/bootm.c +5
-0+#ifdef DEBUG +if (machid ==BI_ARCH_NUMBER_INVALID ) +printf ("Warning: machid not set.\n" ); +#endif +Is it essential to enclose that check in #ifdef DEBUG? IMHO, it can be useful also with no DEBUG defined, so I'd add it without the #ifdef DEBUG.
Quoted 2 lines
Also, in the printf line, you are mixing tabs with spaces (sorry for not noticing this in previous versions...).
...and if you want to print something only for debug purposes, the best way is to substitute printf() with debug() and get rid of #ifdef.
+ if (machid == BI_ARCH_NUMBER_INVALID)
+ debug("Warning: machid not set.\n");
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v3 3/4 ARM: Warn when the machine ID isn't set.
Quoted 16 lines · Stefano Babic
Quoted 11 lines · Igor Grinberg
arch/arm/lib/bootm.c int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) · line 120
Quoted 5 lines
arch/arm/lib/bootm.c +5
-0+#ifdef DEBUG +if (machid ==BI_ARCH_NUMBER_INVALID ) +printf ("Warning: machid not set.\n" ); +#endif +Is it essential to enclose that check in #ifdef DEBUG? IMHO, it can be useful also with no DEBUG defined, so I'd add it without the #ifdef DEBUG.
Also, in the printf line, you are mixing tabs with spaces (sorry for not noticing this in previous versions...).
...and if you want to print something only for debug purposes, the best way is to substitute
printf()withdebug()and get rid of #ifdef.
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (machid == BI_ARCH_NUMBER_INVALID) + debug("Warning: machid not set.\n");
That is understood completely and that is not what I'm asking... I think that this warning should be printed not just for debug purposes... So, I'd prefer:
+ if (machid == BI_ARCH_NUMBER_INVALID)
+ printf("Warning: machid not set.\n");
with no #ifdefs.
So, I'm asking is it essential to make it only for debug purposes? Are there any cases when this code will harm if no #define DEBUG is specified?
Signature · 2 lines
Regards, Igor.
PATCH v3 3/4 ARM: Warn when the machine ID isn't set.
Am 17/07/2011 08:53, schrieb Igor Grinberg:
Quoted 15 lines
Review
Quoted 7 lines
Quoted 2 lines
Also, in the printf line, you are mixing tabs with spaces (sorry for not noticing this in previous versions...).
...and if you want to print something only for debug purposes, the best way is to substitute
printf()withdebug()and get rid of #ifdef.(quoted diff) +2
-0+ if (machid == BI_ARCH_NUMBER_INVALID) + debug("Warning: machid not set.\n");That is understood completely and that is not what I'm asking... I think that this warning should be printed not just for debug purposes... So, I'd prefer:
arch/arm/lib/bootm.c +2
-0+if (machid ==BI_ARCH_NUMBER_INVALID ) +printf ("Warning: machid not set.\n" );
Quoted 1 line
with no #ifdefs.
Agree. And because the goal of thi patch is to warn when the mach-id is not set, I am expecting to see this warning on the console without recompiling the code.
Quoted 1 line
So, I'm asking is it essential to make it only for debug purposes?
IMHO, I think no.
Quoted 1 line
Are there any cases when this code will harm if no #define DEBUG is specified?
Agree with you, I do not see any reason to output the warning only if DEBUG is set
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v3 3/4 ARM: Warn when the machine ID isn't set.
Hi all,
Le 17/07/2011 10:26, stefano babic a ?crit :
Quoted 22 lines
Am 17/07/2011 08:53, schrieb Igor Grinberg:
Quoted 15 lines
Review
Quoted 7 lines
Quoted 2 lines
Also, in the printf line, you are mixing tabs with spaces (sorry for not noticing this in previous versions...).
...and if you want to print something only for debug purposes, the best way is to substitute
printf()withdebug()and get rid of #ifdef.(quoted diff) +2
-0+ if (machid == BI_ARCH_NUMBER_INVALID) + debug("Warning: machid not set.\n");That is understood completely and that is not what I'm asking... I think that this warning should be printed not just for debug purposes... So, I'd prefer:
arch/arm/lib/bootm.c +2
-0+if (machid ==BI_ARCH_NUMBER_INVALID ) +printf ("Warning: machid not set.\n" );Quoted 1 line
with no #ifdefs.
Agree. And because the goal of thi patch is to warn when the mach-id is not set, I am expecting to see this warning on the console without recompiling the code.
Quoted 8 lines
Quoted 1 line
So, I'm asking is it essential to make it only for debug purposes?
IMHO, I think no.
Quoted 1 line
Are there any cases when this code will harm if no #define DEBUG is specified?
Agree with you, I do not see any reason to output the warning only if DEBUG is set
Agreed as well, only more so: I see reason for this warning *only* if it is emitted in non-DEBUG builds. Such a warning is emitted to warn against possible future complications; if it is only emitted in DEBUG builds, then when the complication actually happens, that is, in a production build, the developer is deprived of an important clue regarding the cause.
Quoted 2 lines
Best regards,
Stefano Babic
Amicalement,
Signature · 1 line
Albert.
PATCH v4 3/4 ARM: Warn when the machine ID isn't set.
In reply to Christopher HarveyLinux cannot boot without it.
---
V2:
Used a #define instead of a constant.
Used a printf instead of a debug.
---
V3:
Moved gd->bd->bi_arch_number = BI_ARCH_NUMBER_INVALID; before the
init_sequence loop, so it doesn't overwrite existing values.
Removed unneeded braces.
Reminder, in V2 of this series there are 3 uncommited patches that
have no comments.
---
V3:
Fixed mixed tabs and spaces.
Message prints in both debug and release mode.
arch/arm/include/asm/u-boot.h | 2 ++ arch/arm/lib/board.c | 2 ++ arch/arm/lib/bootm.c | 3 +++ 3 files changed, 7 insertions(+), 0 deletions(-)
arch/arm/include/asm/u-boot.h +2 -0
@@ -48,4 +48,6 @@ typedef struct bd_info { } bi_dram[CONFIG_NR_DRAM_BANKS]; } bd_t; +#define BI_ARCH_NUMBER_INVALID 0xffffffff +#endif /* _U_BOOT_H_ */
arch/arm/lib/board.c +2 -0
@@ -281,6 +281,8 @@ void board_init_f (ulong bootflag) gd->mon_len = _bss_end_ofs; + gd->bd->bi_arch_number =BI_ARCH_NUMBER_INVALID ; +for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {if ((*init_fnc_ptr)() !=0 ) {hang ();
arch/arm/lib/bootm.c +3 -0
@@ -113,6 +113,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf ("Using machid 0x%x from environment\n" , machid); } +if (machid ==BI_ARCH_NUMBER_INVALID ) +printf ("Warning: machid not set.\n" ); +show_boot_progress (15 );#ifdef CONFIG_OF_LIBFDT
Signature · 1 line
1.7.3.4
PATCH v4 3/4 ARM: Warn when the machine ID isn't set.
Hi Christopher,
Le 18/07/2011 19:33, Christopher Harvey a ?crit :
Quoted 59 lines
Linux cannot boot without it.
Signed-off-by Christopher Harvey<[email protected]>---
V2:
Used a #define instead of a constant.
Used a printf instead of a debug.---
V3:
Movedgd->bd->bi_arch_number=BI_ARCH_NUMBER_INVALID; before the
init_sequenceloop, so it doesn't overwrite existing values.
Removed unneeded braces.Reminder, in V2 of this series there are 3 uncommited patches that
have no comments.---
V3:
Fixed mixed tabs and spaces.
Message prints in both debug and release mode.arch/arm/include/asm/u-boot.h | 2 ++ arch/arm/lib/board.c | 2 ++ arch/arm/lib/bootm.c | 3 +++ 3 files changed, 7 insertions(+), 0 deletions(-)arch/arm/include/asm/u-boot.h +2
-0@@ -48,4 +48,6 @@ typedef struct bd_info { } bi_dram[CONFIG_NR_DRAM_BANKS]; } bd_t; +#define BI_ARCH_NUMBER_INVALID 0xffffffff +#endif /* _U_BOOT_H_ */ arch/arm/lib/board.c +2
-0@@ -281,6 +281,8 @@ void board_init_f (ulong bootflag) gd->mon_len = _bss_end_ofs; + gd->bd->bi_arch_number =BI_ARCH_NUMBER_INVALID ; +for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {if ((*init_fnc_ptr)() !=0 ) {hang ();arch/arm/lib/bootm.c +0
-0
arch/arm/lib/bootm.c int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) · line 121
Quoted 9 lines
arch/arm/lib/bootm.c +3
-0@@ -113,6 +113,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf ("Using machid 0x%x from environment\n" , machid); } +if (machid ==BI_ARCH_NUMBER_INVALID ) +printf ("Warning: machid not set.\n" ); +show_boot_progress (15 );#ifdef CONFIG_OF_LIBFDT
This patch does not apply cleanly any more. Can you post a rebased V5 please?
Amicalement,
PATCH v4 3/4 ARM: Warn when the machine ID isn't set.
Le 04/08/2011 08:30, Albert ARIBAUD a ?crit :
Quoted 70 lines
Hi Christopher,
Le 18/07/2011 19:33, Christopher Harvey a ?crit :
Quoted 67 lines
Linux cannot boot without it.
Signed-off-by Christopher Harvey<[email protected]>---
V2:
Used a #define instead of a constant.
Used a printf instead of a debug.---
V3:
Movedgd->bd->bi_arch_number=BI_ARCH_NUMBER_INVALID; before the
init_sequenceloop, so it doesn't overwrite existing values.
Removed unneeded braces.Reminder, in V2 of this series there are 3 uncommited patches that
have no comments.---
V3:
Fixed mixed tabs and spaces.
Message prints in both debug and release mode.arch/arm/include/asm/u-boot.h | 2 ++ arch/arm/lib/board.c | 2 ++ arch/arm/lib/bootm.c | 3 +++ 3 files changed, 7 insertions(+), 0 deletions(-)arch/arm/include/asm/u-boot.h +2
-0@@ -48,4 +48,6 @@ typedef struct bd_info { } bi_dram[CONFIG_NR_DRAM_BANKS]; } bd_t; +#define BI_ARCH_NUMBER_INVALID 0xffffffff +#endif /* _U_BOOT_H_ */ arch/arm/lib/board.c +2
-0@@ -281,6 +281,8 @@ void board_init_f (ulong bootflag) gd->mon_len = _bss_end_ofs; + gd->bd->bi_arch_number =BI_ARCH_NUMBER_INVALID ; +for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {if ((*init_fnc_ptr)() !=0 ) {hang ();arch/arm/lib/bootm.c +3
-0@@ -113,6 +113,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf ("Using machid 0x%x from environment\n" , machid); } +if (machid ==BI_ARCH_NUMBER_INVALID ) +printf ("Warning: machid not set.\n" ); +show_boot_progress (15 );
Quoted 4 lines
arch/arm/lib/bootm.c int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) · line 121
Quoted 1 line
arch/arm/lib/bootm.c +0
-0#ifdef CONFIG_OF_LIBFDT This patch does not apply cleanly any more. Can you post a rebased V5 please?
Ping?
Amicalement,
Signature · 1 line
Albert.
PATCH v4 3/4 ARM: Warn when the machine ID isn't set.
Quoted 76 lines · Albert ARIBAUD
Le 04/08/2011 08:30, Albert ARIBAUD a ?crit :
Quoted 70 lines
Hi Christopher,
Le 18/07/2011 19:33, Christopher Harvey a ?crit :
Quoted 67 lines
Linux cannot boot without it.
Signed-off-by Christopher Harvey<[email protected]>---
V2:
Used a #define instead of a constant.
Used a printf instead of a debug.---
V3:
Movedgd->bd->bi_arch_number=BI_ARCH_NUMBER_INVALID; before the
init_sequenceloop, so it doesn't overwrite existing values.
Removed unneeded braces.Reminder, in V2 of this series there are 3 uncommited patches that
have no comments.---
V3:
Fixed mixed tabs and spaces.
Message prints in both debug and release mode.arch/arm/include/asm/u-boot.h | 2 ++ arch/arm/lib/board.c | 2 ++ arch/arm/lib/bootm.c | 3 +++ 3 files changed, 7 insertions(+), 0 deletions(-)arch/arm/include/asm/u-boot.h +2
-0@@ -48,4 +48,6 @@ typedef struct bd_info { } bi_dram[CONFIG_NR_DRAM_BANKS]; } bd_t; +#define BI_ARCH_NUMBER_INVALID 0xffffffff +#endif /* _U_BOOT_H_ */ arch/arm/lib/board.c +2
-0@@ -281,6 +281,8 @@ void board_init_f (ulong bootflag) gd->mon_len = _bss_end_ofs; + gd->bd->bi_arch_number =BI_ARCH_NUMBER_INVALID ; +for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {if ((*init_fnc_ptr)() !=0 ) {hang ();arch/arm/lib/bootm.c +3
-0@@ -113,6 +113,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf ("Using machid 0x%x from environment\n" , machid); } +if (machid ==BI_ARCH_NUMBER_INVALID ) +printf ("Warning: machid not set.\n" ); +show_boot_progress (15 );Quoted 4 lines
arch/arm/lib/bootm.c int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) · line 121
Quoted 1 line
arch/arm/lib/bootm.c +0
-0#ifdef CONFIG_OF_LIBFDT This patch does not apply cleanly any more. Can you post a rebased V5 please?
Quoted 6 lines
Ping?
Amicalement,
Signature · 1 line
Albert.
I lost confidence in blindly rebasing because I haven't had time to go through u-boot to make sure no boards are able to set their machine id before I can. When I get a moment I will get back into this code and rebase it when I feel comfortable with the changes. Probably this week.
-Chris
PATCH v5 3/4 ARM: Warn when the machine ID isn't set.
In reply to Christopher HarveyLinux cannot boot without it.
---
V2:
Used a #define instead of a constant.
Used a printf instead of a debug.
---
V3:
Moved gd->bd->bi_arch_number = BI_ARCH_NUMBER_INVALID; before the
init_sequence loop, so it doesn't overwrite existing values.
Removed unneeded braces.
Reminder, in V2 of this series there are 3 uncommited patches that
have no comments.
---
V4:
Fixed mixed tabs and spaces.
Message prints in both debug and release mode.
---
V5:
Rebase to bd061a5214e60c9d1bb24393933323bd1a2dae19
arch/arm/include/asm/u-boot.h | 2 ++ arch/arm/lib/board.c | 3 +++ arch/arm/lib/bootm.c | 3 +++ 3 files changed, 8 insertions(+), 0 deletions(-)
arch/arm/include/asm/u-boot.h +2 -0
@@ -48,4 +48,6 @@ typedef struct bd_info { } bi_dram[CONFIG_NR_DRAM_BANKS]; } bd_t; +#define BI_ARCH_NUMBER_INVALID 0xffffffff +#endif /* _U_BOOT_H_ */
arch/arm/lib/board.c +3 -0
@@ -275,8 +275,11 @@ void board_init_f(ulong bootflag) gd->mon_len = _bss_end_ofs; +#ifdef CONFIG_MACH_TYPE gd->bd->bi_arch_number =CONFIG_MACH_TYPE ;/* board id for Linux */ +#else + gd->bd->bi_arch_number =BI_ARCH_NUMBER_INVALID ;#endif for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
arch/arm/lib/bootm.c +3 -0
@@ -113,6 +113,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf ("Using machid 0x%x from environment\n" , machid); } +if (machid ==BI_ARCH_NUMBER_INVALID ) +printf ("Warning: machid not set.\n" ); +show_boot_progress (15 );#ifdef CONFIG_OF_LIBFDT
Signature · 1 line
1.7.4.5
PATCH v2 4/4 Removed unused define, CONFIG_ARMV7.
In reply to Christopher Harvey---
V2:
Removed left over newlines.
Made sure that this isn't the only "High level option", so everything looks ok around the sed'd text.
include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/ca9x4_ct_vxp.h | 3 --- include/configs/cm_t35.h | 1 - include/configs/devkit8000.h | 1 - include/configs/dig297.h | 1 - include/configs/igep0020.h | 1 - include/configs/igep0030.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap3_pandora.h | 1 - include/configs/omap3_sdp3430.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omap3_zoom2.h | 1 - include/configs/omap4_panda.h | 1 - include/configs/omap4_sdp4430.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/s5pc210_universal.h | 1 - include/configs/smdkc100.h | 1 - include/configs/smdkv310.h | 1 - 21 files changed, 0 insertions(+), 23 deletions(-)
include/configs/am3517_crane.h +0 -1
@@ -28,7 +28,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3_AM3517CRANE 1/* working with CRANEBOARD */
include/configs/am3517_evm.h +0 -1
@@ -28,7 +28,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3_AM3517EVM 1/* working with AM3517EVM */
include/configs/ca9x4_ct_vxp.h +0 -3
@@ -32,9 +32,6 @@#define CONFIG_REVISION_TAG 1#define CONFIG_SYS_TEXT_BASE 0x60800000 -/* High Level Configuration Options */ -#define CONFIG_ARMV7 1 -#define CONFIG_SYS_MEMTEST_START 0x60000000#define CONFIG_SYS_MEMTEST_END 0x20000000#define CONFIG_SYS_HZ 1000
include/configs/cm_t35.h +0 -1
@@ -36,7 +36,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */
include/configs/devkit8000.h +0 -1
@@ -32,7 +32,6 @@#define __CONFIG_H/* High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */
include/configs/dig297.h +0 -1
@@ -35,7 +35,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP34XX /* which is a 34XX */ #define CONFIG_OMAP3430 /* which is in a 3430 */
include/configs/igep0020.h +0 -1
@@ -25,7 +25,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */
include/configs/igep0030.h +0 -1
@@ -25,7 +25,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */
include/configs/omap3_beagle.h +0 -1
@@ -31,7 +31,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */
include/configs/omap3_evm.h +0 -1
@@ -36,7 +36,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */
include/configs/omap3_overo.h +0 -1
@@ -23,7 +23,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */
include/configs/omap3_pandora.h +0 -1
@@ -26,7 +26,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */
include/configs/omap3_sdp3430.h +0 -1
@@ -36,7 +36,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */
include/configs/omap3_zoom1.h +0 -1
@@ -32,7 +32,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */
include/configs/omap3_zoom2.h +0 -1
@@ -33,7 +33,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */
include/configs/omap4_panda.h +0 -1
@@ -30,7 +30,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP44XX 1/* which is a 44XX */ #define CONFIG_OMAP4430 1/* which is in a 4430 */
include/configs/omap4_sdp4430.h +0 -1
@@ -31,7 +31,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP44XX 1/* which is a 44XX */ #define CONFIG_OMAP4430 1/* which is in a 4430 */
include/configs/s5p_goni.h +0 -1
@@ -28,7 +28,6 @@#define __CONFIG_H/* High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_SAMSUNG 1/* in a SAMSUNG core */ #define CONFIG_S5P 1/* which is in a S5P Family */ #define CONFIG_S5PC110 1/* which is in a S5PC110 */
include/configs/s5pc210_universal.h +0 -1
@@ -30,7 +30,6 @@* High Level Configuration Options * (easy to change) */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_SAMSUNG 1/* in a SAMSUNG core */ #define CONFIG_S5P 1/* which is in a S5P Family */ #define CONFIG_S5PC210 1/* which is in a S5PC210 */
include/configs/smdkc100.h +0 -1
@@ -32,7 +32,6 @@* High Level Configuration Options * (easy to change) */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_SAMSUNG 1/* in a SAMSUNG core */ #define CONFIG_S5P 1/* which is in a S5P Family */ #define CONFIG_S5PC100 1/* which is in a S5PC100 */
include/configs/smdkv310.h +0 -1
@@ -26,7 +26,6 @@#define __CONFIG_H/* High Level Configuration Options */ -#define CONFIG_ARMV7 1/*This is an ARM V7 CPU core */ #define CONFIG_SAMSUNG 1/* in a SAMSUNG core */ #define CONFIG_S5P 1/* S5P Family */ #define CONFIG_S5PC210 1/* which is in a S5PC210 SoC */
Signature · 1 line
1.7.3.4
PATCH v2 4/4 Removed unused define, CONFIG_ARMV7.
Hi Christopher,
Le 07/07/2011 16:37, Christopher Harvey a ?crit :
Quoted 280 lines
Signed-off-by Christopher Harvey<[email protected]>---
V2:
Removed left over newlines.
Made sure that this isn't the only "High level option", so everything looks ok around the sed'd text.
include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/ca9x4_ct_vxp.h | 3 --- include/configs/cm_t35.h | 1 - include/configs/devkit8000.h | 1 - include/configs/dig297.h | 1 - include/configs/igep0020.h | 1 - include/configs/igep0030.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap3_pandora.h | 1 - include/configs/omap3_sdp3430.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omap3_zoom2.h | 1 - include/configs/omap4_panda.h | 1 - include/configs/omap4_sdp4430.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/s5pc210_universal.h | 1 - include/configs/smdkc100.h | 1 - include/configs/smdkv310.h | 1 - 21 files changed, 0 insertions(+), 23 deletions(-)include/configs/am3517_crane.h +0
-1@@ -28,7 +28,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3_AM3517CRANE 1/* working with CRANEBOARD */ include/configs/am3517_evm.h +0
-1@@ -28,7 +28,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3_AM3517EVM 1/* working with AM3517EVM */ include/configs/ca9x4_ct_vxp.h +0
-3@@ -32,9 +32,6 @@#define CONFIG_REVISION_TAG 1#define CONFIG_SYS_TEXT_BASE 0x60800000 -/* High Level Configuration Options */ -#define CONFIG_ARMV7 1 -#define CONFIG_SYS_MEMTEST_START 0x60000000#define CONFIG_SYS_MEMTEST_END 0x20000000#define CONFIG_SYS_HZ 1000include/configs/cm_t35.h +0
-1@@ -36,7 +36,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */ include/configs/devkit8000.h +0
-1@@ -32,7 +32,6 @@#define __CONFIG_H/* High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */ include/configs/dig297.h +0
-1@@ -35,7 +35,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP34XX /* which is a 34XX */ #define CONFIG_OMAP3430 /* which is in a 3430 */ include/configs/igep0020.h +0
-1@@ -25,7 +25,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */ include/configs/igep0030.h +0
-1@@ -25,7 +25,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */ include/configs/omap3_beagle.h +0
-1@@ -31,7 +31,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */ include/configs/omap3_evm.h +0
-1@@ -36,7 +36,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */ include/configs/omap3_overo.h +0
-1@@ -23,7 +23,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */ include/configs/omap3_pandora.h +0
-1@@ -26,7 +26,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */ include/configs/omap3_sdp3430.h +0
-1@@ -36,7 +36,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */ include/configs/omap3_zoom1.h +0
-1@@ -32,7 +32,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */ include/configs/omap3_zoom2.h +0
-1@@ -33,7 +33,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP34XX 1/* which is a 34XX */ #define CONFIG_OMAP3430 1/* which is in a 3430 */ include/configs/omap4_panda.h +0
-1@@ -30,7 +30,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP44XX 1/* which is a 44XX */ #define CONFIG_OMAP4430 1/* which is in a 4430 */ include/configs/omap4_sdp4430.h +0
-1@@ -31,7 +31,6 @@/* * High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ #define CONFIG_OMAP44XX 1/* which is a 44XX */ #define CONFIG_OMAP4430 1/* which is in a 4430 */ include/configs/s5p_goni.h +0
-1@@ -28,7 +28,6 @@#define __CONFIG_H/* High Level Configuration Options */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_SAMSUNG 1/* in a SAMSUNG core */ #define CONFIG_S5P 1/* which is in a S5P Family */ #define CONFIG_S5PC110 1/* which is in a S5PC110 */ include/configs/s5pc210_universal.h +0
-1@@ -30,7 +30,6 @@* High Level Configuration Options * (easy to change) */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_SAMSUNG 1/* in a SAMSUNG core */ #define CONFIG_S5P 1/* which is in a S5P Family */ #define CONFIG_S5PC210 1/* which is in a S5PC210 */ include/configs/smdkc100.h +0
-1@@ -32,7 +32,6 @@* High Level Configuration Options * (easy to change) */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ #define CONFIG_SAMSUNG 1/* in a SAMSUNG core */ #define CONFIG_S5P 1/* which is in a S5P Family */ #define CONFIG_S5PC100 1/* which is in a S5PC100 */ include/configs/smdkv310.h +0
-0
include/configs/smdkv310.h line 31
Quoted 7 lines
include/configs/smdkv310.h +0
-1@@ -26,7 +26,6 @@#define __CONFIG_H/* High Level Configuration Options */ -#define CONFIG_ARMV7 1/*This is an ARM V7 CPU core */ #define CONFIG_SAMSUNG 1/* in a SAMSUNG core */ #define CONFIG_S5P 1/* S5P Family */ #define CONFIG_S5PC210 1/* which is in a S5PC210 SoC */
Applied to u-boot-arm/master, thanks!
Amicalement,
Signature · 1 line
Albert.