[U-Boot] [PATCH V2 0/4] 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(-)
Signed-off-by: Christopher Harvey charvey@matrox.com --- V2: Make it clear that this is the start address of u-boot.
README | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/README b/README index 2da0f96..8345746 100644 --- a/README +++ b/README @@ -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)
Hi Christopher,
Le 07/07/2011 16:26, Christopher Harvey a écrit :
Signed-off-by: Christopher Harveycharvey@matrox.com
V2: Make it clear that this is the start address of u-boot.
README | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/README b/README index 2da0f96..8345746 100644 --- a/README +++ b/README @@ -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 fromwithin ROM. This value has nothing to do with the relocationdestination 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,
On Thu, Aug 04, 2011 at 08:20:33AM +0200, Albert ARIBAUD wrote:
Hi Christopher,
Le 07/07/2011 16:26, Christopher Harvey a ?crit :
Signed-off-by: Christopher Harveycharvey@matrox.com
V2: Make it clear that this is the start address of u-boot.
README | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/README b/README index 2da0f96..8345746 100644 --- a/README +++ b/README @@ -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 fromwithin ROM. This value has nothing to do with the relocationdestination 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,
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.
Dear Christopher Harvey,
In message 20110824183457.GB3070@harvey-pc.matrox.com you wrote:
+- 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 fromwithin ROM. This value has nothing to do with the relocationdestination 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!
...
I'm curious, this one never went in. I'd like to know if I'm not understanding CONFIG_SYS_TEXT_BASE completely.
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
Signed-off-by: Christopher Harvey charvey@matrox.com ---
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(-)
diff --git a/common/cmd_mem.c b/common/cmd_mem.c index a5576aa..833af66 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -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(
Hi Christopher,
Le 07/07/2011 16:31, Christopher Harvey a écrit :
Signed-off-by: Christopher Harveycharvey@matrox.com
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(-)
diff --git a/common/cmd_mem.c b/common/cmd_mem.c index a5576aa..833af66 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -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(
Applied to u-boot-arm/master, thanks!
Amicalement,
Dear Albert ARIBAUD,
In message 4E3A3CB8.2030703@aribaud.net 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(-)
...
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
On 04/08/2011 12:14, Wolfgang Denk wrote:
Dear Albert ARIBAUD,
In message4E3A3CB8.2030703@aribaud.net 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(-)
...
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.
Quite understandable, as I hurriedly applied the entire four-patch set when I should only have pulled the last two, ARM-related, patches.
Best regards,
Wolfgang Denk
Amicalement,
Dear Christopher Harvey,
In message 20110707143109.GC5438@harvey-pc.matrox.com 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(-)
diff --git a/common/cmd_mem.c b/common/cmd_mem.c index a5576aa..833af66 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -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
Linux cannot boot without it.
Signed-off-by: Christopher Harvey charvey@matrox.com ---
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(-)
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h index ed33327..81735de 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/u-boot.h @@ -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_ */ diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index fc52a26..4923397 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -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 ... */ diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 802e833..ea9bf17 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -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
On 07/07/11 17:34, Christopher Harvey wrote:
Linux cannot boot without it.
Signed-off-by: Christopher Harvey charvey@matrox.com
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(-)
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h index ed33327..81735de 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/u-boot.h @@ -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_ */ diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index fc52a26..4923397 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -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 ... */
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 802e833..ea9bf17 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -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?
On 07/07/11 19:55, Igor Grinberg wrote:
On 07/07/11 17:34, Christopher Harvey wrote:
Linux cannot boot without it.
Signed-off-by: Christopher Harvey charvey@matrox.com
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(-)
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h index ed33327..81735de 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/u-boot.h @@ -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_ */ diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index fc52a26..4923397 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -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...
gd->bd->bi_baudrate = gd->baudrate; /* Ram ist board specific, so move it to board code ... */ diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 802e833..ea9bf17 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -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?
Linux cannot boot without it.
Signed-off-by: Christopher Harvey charvey@matrox.com ---
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(-)
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h index ed33327..81735de 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/u-boot.h @@ -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_ */ diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index fc52a26..1635aa1 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -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 (); diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 802e833..8e75b5a 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -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
Hi Christopher,
On 07/14/11 21:02, Christopher Harvey wrote:
Linux cannot boot without it.
Signed-off-by: Christopher Harvey charvey@matrox.com
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.
This one looks fine, except that you keep ignoring my question... Please, see below
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(-)
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h index ed33327..81735de 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/u-boot.h @@ -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_ */ diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index fc52a26..1635aa1 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -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 ();
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 802e833..8e75b5a 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -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...).
On 07/14/2011 09:02 PM, Igor Grinberg wrote:
+#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() with debug() and get rid of #ifdef.
+ if (machid == BI_ARCH_NUMBER_INVALID) + debug("Warning: machid not set.\n");
Best regards, Stefano Babic
On 07/15/11 15:44, Stefano Babic wrote:
On 07/14/2011 09:02 PM, Igor Grinberg wrote:
+#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() with debug() and get rid of #ifdef.
- 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?
Am 17/07/2011 08:53, schrieb Igor Grinberg:
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");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.
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.
So, I'm asking is it essential to make it only for debug purposes?
IMHO, I think no.
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
Hi all,
Le 17/07/2011 10:26, stefano babic a écrit :
Am 17/07/2011 08:53, schrieb Igor Grinberg:
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");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.
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.
So, I'm asking is it essential to make it only for debug purposes?
IMHO, I think no.
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.
Best regards, Stefano Babic
Amicalement,
Linux cannot boot without it.
Signed-off-by: Christopher Harvey charvey@matrox.com ---
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(-)
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h index ed33327..81735de 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/u-boot.h @@ -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_ */ diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index fc52a26..1635aa1 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -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 (); diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 802e833..d5fd26b 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -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
Hi Christopher,
Le 18/07/2011 19:33, Christopher Harvey a écrit :
Linux cannot boot without it.
Signed-off-by: Christopher Harveycharvey@matrox.com
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(-)
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h index ed33327..81735de 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/u-boot.h @@ -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_ */
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index fc52a26..1635aa1 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -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 ();
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 802e833..d5fd26b 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -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,
Le 04/08/2011 08:30, Albert ARIBAUD a écrit :
Hi Christopher,
Le 18/07/2011 19:33, Christopher Harvey a écrit :
Linux cannot boot without it.
Signed-off-by: Christopher Harveycharvey@matrox.com
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(-)
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h index ed33327..81735de 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/u-boot.h @@ -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_ */
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index fc52a26..1635aa1 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -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 ();
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 802e833..d5fd26b 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -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?
Ping?
Amicalement,
On Wed, Aug 24, 2011 at 04:31:20PM +0200, Albert ARIBAUD wrote:
Le 04/08/2011 08:30, Albert ARIBAUD a ?crit :
Hi Christopher,
Le 18/07/2011 19:33, Christopher Harvey a ?crit :
Linux cannot boot without it.
Signed-off-by: Christopher Harveycharvey@matrox.com
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(-)
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h index ed33327..81735de 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/u-boot.h @@ -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_ */
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index fc52a26..1635aa1 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -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 ();
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 802e833..d5fd26b 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -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?
Ping?
Amicalement,
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
Linux cannot boot without it.
Signed-off-by: Christopher Harvey charvey@matrox.com ---
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(-)
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h index ed33327..81735de 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/u-boot.h @@ -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_ */ diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 14a56f6..58e901b 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -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) { diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 802e833..d5fd26b 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -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
Signed-off-by: Christopher Harvey charvey@matrox.com ---
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(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 09cb951..743768e 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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 */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 80ad342..7304c13 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 */ diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h index f0ac79a..8c57eab 100644 --- a/include/configs/ca9x4_ct_vxp.h +++ b/include/configs/ca9x4_ct_vxp.h @@ -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 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 93a1b26..16a5f5b 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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 */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 125c690..cf77606 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 */ diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 7aeb24e..b68f073 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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 */ diff --git a/include/configs/igep0020.h b/include/configs/igep0020.h index 5af9bec..b6534e4 100644 --- a/include/configs/igep0020.h +++ b/include/configs/igep0020.h @@ -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 */ diff --git a/include/configs/igep0030.h b/include/configs/igep0030.h index 92144af..d85e5ae 100644 --- a/include/configs/igep0030.h +++ b/include/configs/igep0030.h @@ -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 */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 9fd80ed..d7cbc2f 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 13a4fbf..afa18aa 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -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 */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 242b317..d6e0a06 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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 */ diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 39c87a8..bd55abc 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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 */ diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index 55bbcd4..e1d8c78 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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 */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 9183849..aeac7c7 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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 */ diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index 3573edf..2a56182 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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 */ diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 1daffb7..d96c589 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -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 */ diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index 68ffa87..8c97dc3 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -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 */ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index d648ce8..a5aa859 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -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 */ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index bbe104b..4031016 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -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 */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 70e23b5..19dde1b 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -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 */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index a7f5850..1ba3256 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -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 */
Hi Christopher,
Le 07/07/2011 16:37, Christopher Harvey a écrit :
Signed-off-by: Christopher Harveycharvey@matrox.com
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(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 09cb951..743768e 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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 */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 80ad342..7304c13 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 */ diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h index f0ac79a..8c57eab 100644 --- a/include/configs/ca9x4_ct_vxp.h +++ b/include/configs/ca9x4_ct_vxp.h @@ -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
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 93a1b26..16a5f5b 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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 */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 125c690..cf77606 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 */ diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 7aeb24e..b68f073 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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 */ diff --git a/include/configs/igep0020.h b/include/configs/igep0020.h index 5af9bec..b6534e4 100644 --- a/include/configs/igep0020.h +++ b/include/configs/igep0020.h @@ -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 */ diff --git a/include/configs/igep0030.h b/include/configs/igep0030.h index 92144af..d85e5ae 100644 --- a/include/configs/igep0030.h +++ b/include/configs/igep0030.h @@ -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 */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 9fd80ed..d7cbc2f 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 13a4fbf..afa18aa 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -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 */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 242b317..d6e0a06 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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 */ diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 39c87a8..bd55abc 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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 */ diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index 55bbcd4..e1d8c78 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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 */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 9183849..aeac7c7 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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 */ diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index 3573edf..2a56182 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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 */ diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 1daffb7..d96c589 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -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 */ diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index 68ffa87..8c97dc3 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -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 */ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index d648ce8..a5aa859 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -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 */ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index bbe104b..4031016 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -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 */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 70e23b5..19dde1b 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -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 */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index a7f5850..1ba3256 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -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,
participants (6)
-
Albert ARIBAUD -
Christopher Harvey -
Igor Grinberg -
Stefano Babic -
stefano babic
-
Wolfgang Denk