image: push default arch values to arch headers

PATCH New Mike Frysinger 3 participants 11 messages Sep 26, 2011 – Oct 5, 2011 1 message not in the archive

Subsystems (9)

Arm (32-bit) x86 PowerPC MIPS +5 more subsystems

lore

Share & tools

lore

Mike Frysinger

author

2011-09-26 05:53 UTC #0 lore raw

PATCH 1/1 image: push default arch values to arch headers

This pushes the ugly duplicated arch ifdef lists we maintain in various image related files out to the arch headers themselves.

Signed-off-by Mike Frysinger <[email protected]>

---
 arch/arm/include/asm/u-boot.h        |    3 ++
 arch/avr32/include/asm/u-boot.h      |    3 ++
 arch/blackfin/include/asm/u-boot.h   |    3 ++
 arch/m68k/include/asm/u-boot.h       |    3 ++
 arch/microblaze/include/asm/u-boot.h |    2 +
 arch/mips/include/asm/u-boot.h       |    3 ++
 arch/nios2/include/asm/u-boot.h      |    2 +
 arch/powerpc/include/asm/u-boot.h    |    4 ++
 arch/sh/include/asm/u-boot.h         |    3 ++
 arch/sparc/include/asm/u-boot.h      |    4 ++
 arch/x86/include/asm/u-boot.h        |    3 ++
 common/cmd_bootm.c                   |   26 +--------------
 include/image.h                      |   58 +--------------------------------
 13 files changed, 36 insertions(+), 81 deletions(-)

arch/arm/include/asm/u-boot.h +3 -0

index ed33327..f30b9fc 100644
@@ -48,4 +48,7 @@ typedef struct bd_info {
     }			bi_dram[CONFIG_NR_DRAM_BANKS];
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_ARM
+
 #endif	/* _U_BOOT_H_ */

arch/avr32/include/asm/u-boot.h +3 -0

index 8acd056..ff1ed23 100644
@@ -40,4 +40,7 @@ typedef struct bd_info {
 #define bi_memstart bi_dram[0].start
 #define bi_memsize bi_dram[0].size
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_AVR32
+
 #endif /* __ASM_U_BOOT_H__ */

arch/blackfin/include/asm/u-boot.h +3 -0

index a6e6cf0f..9712fc0 100644
@@ -45,4 +45,7 @@ typedef struct bd_info {
 	unsigned long bi_sclk;
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_BLACKFIN
+
 #endif	/* _U_BOOT_H_ */

arch/m68k/include/asm/u-boot.h +3 -0

index a0f2983..0a48bbd 100644
@@ -64,4 +64,7 @@ typedef struct bd_info {
 
 #endif				/* __ASSEMBLY__ */
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_M68K
+
 #endif				/* __U_BOOT_H__ */

arch/microblaze/include/asm/u-boot.h +2 -0

index 543a6b1..21c72d5 100644
@@ -44,5 +44,7 @@ typedef struct bd_info {
 	unsigned long	bi_baudrate;	/* Console Baudrate */
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_MICROBLAZE
 
 #endif	/* _U_BOOT_H_ */

arch/mips/include/asm/u-boot.h +3 -0

index e839ca1..edb87bb 100644
@@ -43,4 +43,7 @@ typedef struct bd_info {
 	unsigned long	bi_flashoffset;	/* reserved area for startup monitor */
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_MIPS
+
 #endif	/* _U_BOOT_H_ */

arch/nios2/include/asm/u-boot.h +2 -0

index ec844d0..f7c70ff 100644
@@ -43,5 +43,7 @@ typedef struct bd_info {
 	unsigned long	bi_baudrate;	/* Console Baudrate */
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_NIOS2
 
 #endif	/* __ASM_NIOS2_U_BOOT_H_ */

arch/powerpc/include/asm/u-boot.h +4 -0

index 721692a..b2fa2b5 100644
@@ -143,4 +143,8 @@ typedef struct bd_info {
 } bd_t;
 
 #endif /* __ASSEMBLY__ */
+
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_PPC
+
 #endif	/* __U_BOOT_H__ */

arch/sh/include/asm/u-boot.h +3 -0

index 27d43b9..4574512 100644
@@ -38,4 +38,7 @@ typedef struct bd_info {
 	unsigned long	bi_boot_params; /* where this board expects params */
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_SH
+
 #endif

arch/sparc/include/asm/u-boot.h +4 -0

index 209873f..1d94087 100644
@@ -59,4 +59,8 @@ typedef struct bd_info {
 } bd_t;
 
 #endif				/* __ASSEMBLY__ */
+
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_SPARC
+
 #endif				/* __U_BOOT_H__ */

arch/x86/include/asm/u-boot.h +3 -0

index a43b3aa..26450eb 100644
@@ -58,4 +58,7 @@ typedef struct bd_info {
 	}bi_dram[CONFIG_NR_DRAM_BANKS];
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_I386
+
 #endif	/* _U_BOOT_H_ */

common/cmd_bootm.c +1 ~~-25~~

index 8909ee7..c2e8038 100644
@@ -165,31 +165,7 @@ void __arch_preboot_os(void)
 }
 void arch_preboot_os(void) __attribute__((weak, alias("__arch_preboot_os")));
 
-#if defined(__ARM__)
-  #define IH_INITRD_ARCH IH_ARCH_ARM
-#elif defined(__avr32__)
-  #define IH_INITRD_ARCH IH_ARCH_AVR32
-#elif defined(__bfin__)
-  #define IH_INITRD_ARCH IH_ARCH_BLACKFIN
-#elif defined(__I386__)
-  #define IH_INITRD_ARCH IH_ARCH_I386
-#elif defined(__M68K__)
-  #define IH_INITRD_ARCH IH_ARCH_M68K
-#elif defined(__microblaze__)
-  #define IH_INITRD_ARCH IH_ARCH_MICROBLAZE
-#elif defined(__mips__)
-  #define IH_INITRD_ARCH IH_ARCH_MIPS
-#elif defined(__nios2__)
-  #define IH_INITRD_ARCH IH_ARCH_NIOS2
-#elif defined(__PPC__)
-  #define IH_INITRD_ARCH IH_ARCH_PPC
-#elif defined(__sh__)
-  #define IH_INITRD_ARCH IH_ARCH_SH
-#elif defined(__sparc__)
-  #define IH_INITRD_ARCH IH_ARCH_SPARC
-#else
-# error Unknown CPU type
-#endif
+#define IH_INITRD_ARCH IH_ARCH_DEFAULT
 
 static void bootm_start_lmb(void)
 {

include/image.h +2 ~~-56~~

70 lines not on this page · raw message

Signature · 1 line

1.7.6.1

Wolfgang Denk

2011-09-26 06:08 UTC #1 lore raw

PATCH 1/1 image: push default arch values to arch headers

Dear Mike Frysinger,

Quoted 2 lines · In message <[email protected]> you wrote:

This pushes the ugly duplicated arch ifdef lists we maintain in various image related files out to the arch headers themselves.

I appreciate this change in general, but ...

...

include/image.h void fit_conf_print (const void *fit, int noffset, const char *p); · line 612

Quoted 7 lines

include/image.h +1 -6

-#else
-# error Unknown CPU type
-#endif
-		return 0;
-
-	return 1;
+	return !fit_image_check_arch(fdt, node, IH_ARCH_DEFAULT));

...here you change a compile time error check into a runtim error.

Please fix this.

Best regards,

Wolfgang Denk

Signature · 4 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
"Ahead warp factor 1"                                  - Captain Kirk

Mike Frysinger

author

2011-09-26 16:09 UTC #2 lore raw

PATCH 1/1 image: push default arch values to arch headers

Quoted 8 lines · On Monday, September 26, 2011 02:08:51 Wolfgang Denk wrote:

Quoted 2 lines · Mike Frysinger
This pushes the ugly duplicated arch ifdef lists we maintain in various image related files out to the arch headers themselves.
I appreciate this change in general, but ...
...

Quoted 9 lines

include/image.h void fit_conf_print (const void *fit, int noffset, const char *p); · line 612
Quoted 7 lines
include/image.h +1 -6
-#else
-# error Unknown CPU type
-#endif
-		return 0;
-
-	return 1;
+	return !fit_image_check_arch(fdt, node, IH_ARCH_DEFAULT));
...here you change a compile time error check into a runtim error.

no, it'll still be a build time error as IH_ARCH_DEFAULT will be undefined

it just might not be as clean an error ... gcc will complain about IH_ARCH_DEFAULT not being defined rather than a helpful "Unknown CPU type" message.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110926/b156156c/attachment.pgp

Wolfgang Denk

2011-09-26 17:58 UTC #3 lore raw

PATCH 1/1 image: push default arch values to arch headers

Dear Mike Frysinger,

Quoted 7 lines · In message <[email protected]> you wrote:

Quoted 2 lines
...here you change a compile time error check into a runtim error.
no, it'll still be a build time error as IH_ARCH_DEFAULT will be undefined
it just might not be as clean an error ... gcc will complain about IH_ARCH_DEFAULT not being defined rather than a helpful "Unknown CPU type"

Should it not be trivial to add a

	#ifndef IH_ARCH_DEFAULT
	# error Unknown CPU type: IH_ARCH_DEFAULT not set
	#endif

or similar to include/image.h ?

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
Children are natural mimics who act like their parents despite  every
effort to teach them good manners.

Mike Frysinger

author

2011-09-26 18:15 UTC #4 lore raw

PATCH 1/1 image: push default arch values to arch headers

Quoted 10 lines · On Monday, September 26, 2011 13:58:59 Wolfgang Denk wrote:

Quoted 8 lines · Mike Frysinger
Quoted 1 line
...here you change a compile time error check into a runtim error.
no, it'll still be a build time error as IH_ARCH_DEFAULT will be undefined
it just might not be as clean an error ... gcc will complain about IH_ARCH_DEFAULT not being defined rather than a helpful "Unknown CPU type"

Quoted 7 lines

Should it not be trivial to add a
	#ifndef IH_ARCH_DEFAULT
	# error Unknown CPU type: IH_ARCH_DEFAULT not set
	#endif
or similar to include/image.h ?

it'd certainly be easy to do. i just pointed out that you still get a build failure after my change :). so if you want the #error, i'll resend w/it. -mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110926/9a1f3d90/attachment.pgp

Wolfgang Denk

2011-09-26 18:45 UTC #5 lore raw

PATCH 1/1 image: push default arch values to arch headers

Dear Mike Frysinger,

Quoted 11 lines · In message <[email protected]> you wrote:

Quoted 8 lines
Should it not be trivial to add a
	#ifndef IH_ARCH_DEFAULT
	# error Unknown CPU type: IH_ARCH_DEFAULT not set
	#endif
or similar to include/image.h ?
it'd certainly be easy to do. i just pointed out that you still get a build failure after my change :). so if you want the #error, i'll resend w/it.

Yes, please do. I think it's easier to decode for most people.

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
"Whoever undertakes to set himself up as a judge of Truth  and  Know-
ledge is shipwrecked by the laughter of the gods."  - Albert Einstein

Mike Frysinger

author

2011-09-26 19:58 UTC #6 lore raw

PATCH v2 1/1 image: push default arch values to arch headers

In reply to Mike Frysinger

This pushes the ugly duplicated arch ifdef lists we maintain in various image related files out to the arch headers themselves.

Signed-off-by Mike Frysinger <[email protected]>

---
v2
- add a friendly #error when the define is missing

 arch/arm/include/asm/u-boot.h        |    3 ++
 arch/avr32/include/asm/u-boot.h      |    3 ++
 arch/blackfin/include/asm/u-boot.h   |    3 ++
 arch/m68k/include/asm/u-boot.h       |    3 ++
 arch/microblaze/include/asm/u-boot.h |    2 +
 arch/mips/include/asm/u-boot.h       |    3 ++
 arch/nios2/include/asm/u-boot.h      |    2 +
 arch/powerpc/include/asm/u-boot.h    |    4 ++
 arch/sh/include/asm/u-boot.h         |    3 ++
 arch/sparc/include/asm/u-boot.h      |    4 ++
 arch/x86/include/asm/u-boot.h        |    3 ++
 common/cmd_bootm.c                   |   26 +--------------
 include/image.h                      |   59 ++-------------------------------
 13 files changed, 38 insertions(+), 80 deletions(-)

arch/arm/include/asm/u-boot.h +3 -0

index ed33327..f30b9fc 100644
@@ -48,4 +48,7 @@ typedef struct bd_info {
     }			bi_dram[CONFIG_NR_DRAM_BANKS];
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_ARM
+
 #endif	/* _U_BOOT_H_ */

arch/avr32/include/asm/u-boot.h +3 -0

index 8acd056..ff1ed23 100644
@@ -40,4 +40,7 @@ typedef struct bd_info {
 #define bi_memstart bi_dram[0].start
 #define bi_memsize bi_dram[0].size
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_AVR32
+
 #endif /* __ASM_U_BOOT_H__ */

arch/blackfin/include/asm/u-boot.h +3 -0

index a6e6cf0f..9712fc0 100644
@@ -45,4 +45,7 @@ typedef struct bd_info {
 	unsigned long bi_sclk;
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_BLACKFIN
+
 #endif	/* _U_BOOT_H_ */

arch/m68k/include/asm/u-boot.h +3 -0

index a0f2983..0a48bbd 100644
@@ -64,4 +64,7 @@ typedef struct bd_info {
 
 #endif				/* __ASSEMBLY__ */
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_M68K
+
 #endif				/* __U_BOOT_H__ */

arch/microblaze/include/asm/u-boot.h +2 -0

index 543a6b1..21c72d5 100644
@@ -44,5 +44,7 @@ typedef struct bd_info {
 	unsigned long	bi_baudrate;	/* Console Baudrate */
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_MICROBLAZE
 
 #endif	/* _U_BOOT_H_ */

arch/mips/include/asm/u-boot.h +3 -0

index e839ca1..edb87bb 100644
@@ -43,4 +43,7 @@ typedef struct bd_info {
 	unsigned long	bi_flashoffset;	/* reserved area for startup monitor */
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_MIPS
+
 #endif	/* _U_BOOT_H_ */

arch/nios2/include/asm/u-boot.h +2 -0

index ec844d0..f7c70ff 100644
@@ -43,5 +43,7 @@ typedef struct bd_info {
 	unsigned long	bi_baudrate;	/* Console Baudrate */
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_NIOS2
 
 #endif	/* __ASM_NIOS2_U_BOOT_H_ */

arch/powerpc/include/asm/u-boot.h +4 -0

index 721692a..b2fa2b5 100644
@@ -143,4 +143,8 @@ typedef struct bd_info {
 } bd_t;
 
 #endif /* __ASSEMBLY__ */
+
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_PPC
+
 #endif	/* __U_BOOT_H__ */

arch/sh/include/asm/u-boot.h +3 -0

index 27d43b9..4574512 100644
@@ -38,4 +38,7 @@ typedef struct bd_info {
 	unsigned long	bi_boot_params; /* where this board expects params */
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_SH
+
 #endif

arch/sparc/include/asm/u-boot.h +4 -0

index 209873f..1d94087 100644
@@ -59,4 +59,8 @@ typedef struct bd_info {
 } bd_t;
 
 #endif				/* __ASSEMBLY__ */
+
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_SPARC
+
 #endif				/* __U_BOOT_H__ */

arch/x86/include/asm/u-boot.h +3 -0

index a43b3aa..26450eb 100644
@@ -58,4 +58,7 @@ typedef struct bd_info {
 	}bi_dram[CONFIG_NR_DRAM_BANKS];
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_I386
+
 #endif	/* _U_BOOT_H_ */

common/cmd_bootm.c +1 ~~-25~~

index 8909ee7..c2e8038 100644
@@ -165,31 +165,7 @@ void __arch_preboot_os(void)
 }
 void arch_preboot_os(void) __attribute__((weak, alias("__arch_preboot_os")));
 
-#if defined(__ARM__)
-  #define IH_INITRD_ARCH IH_ARCH_ARM
-#elif defined(__avr32__)
-  #define IH_INITRD_ARCH IH_ARCH_AVR32
-#elif defined(__bfin__)
-  #define IH_INITRD_ARCH IH_ARCH_BLACKFIN
-#elif defined(__I386__)
-  #define IH_INITRD_ARCH IH_ARCH_I386
-#elif defined(__M68K__)
-  #define IH_INITRD_ARCH IH_ARCH_M68K
-#elif defined(__microblaze__)
-  #define IH_INITRD_ARCH IH_ARCH_MICROBLAZE
-#elif defined(__mips__)
-  #define IH_INITRD_ARCH IH_ARCH_MIPS
-#elif defined(__nios2__)
-  #define IH_INITRD_ARCH IH_ARCH_NIOS2
-#elif defined(__PPC__)
-  #define IH_INITRD_ARCH IH_ARCH_PPC
-#elif defined(__sh__)
-  #define IH_INITRD_ARCH IH_ARCH_SH
-#elif defined(__sparc__)
-  #define IH_INITRD_ARCH IH_ARCH_SPARC
-#else
-# error Unknown CPU type
-#endif
+#define IH_INITRD_ARCH IH_ARCH_DEFAULT
 
 static void bootm_start_lmb(void)
 {

include/image.h +4 ~~-55~~

72 lines not on this page · raw message

Signature · 1 line

1.7.6.1

Thomas Chou

2011-09-29 06:18 UTC #7 lore raw

PATCH v2 1/1 image: push default arch values to arch headers

Hi Mike,

Quoted 7 lines · Mike Frysinger

This pushes the ugly duplicated arch ifdef lists we maintain in various image related files out to the arch headers themselves.
Signed-off-by Mike Frysinger<[email protected]>
---
v2
- add a friendly #error when the define is missing

Compiled and tested on nios2 boards using gcc4 and gcc3 with McNutt's "Add missing header for gcc3" patch applied. Thanks.

Tested-by Thomas Chou <[email protected]>

Best regards,
Thomas

Mike Frysinger

author

2011-10-04 00:50 UTC #8 lore raw

PATCH v3 1/1 image: push default arch values to arch headers

In reply to Mike Frysinger

This pushes the ugly duplicated arch ifdef lists we maintain in various image related files out to the arch headers themselves.

Acked-by Nobuhiro Iwamatsu <[email protected]>

Tested-by Thomas Chou <[email protected]>

Signed-off-by Mike Frysinger <[email protected]>

---
v3
- fix typo in fdt-specific code path

 arch/arm/include/asm/u-boot.h        |    3 ++
 arch/avr32/include/asm/u-boot.h      |    3 ++
 arch/blackfin/include/asm/u-boot.h   |    3 ++
 arch/m68k/include/asm/u-boot.h       |    3 ++
 arch/microblaze/include/asm/u-boot.h |    2 +
 arch/mips/include/asm/u-boot.h       |    3 ++
 arch/nios2/include/asm/u-boot.h      |    2 +
 arch/powerpc/include/asm/u-boot.h    |    4 ++
 arch/sh/include/asm/u-boot.h         |    3 ++
 arch/sparc/include/asm/u-boot.h      |    4 ++
 arch/x86/include/asm/u-boot.h        |    3 ++
 common/cmd_bootm.c                   |   26 +--------------
 include/image.h                      |   59 ++-------------------------------
 13 files changed, 38 insertions(+), 80 deletions(-)

arch/arm/include/asm/u-boot.h +3 -0

index ed33327..f30b9fc 100644
@@ -48,4 +48,7 @@ typedef struct bd_info {
     }			bi_dram[CONFIG_NR_DRAM_BANKS];
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_ARM
+
 #endif	/* _U_BOOT_H_ */

arch/avr32/include/asm/u-boot.h +3 -0

index 8acd056..ff1ed23 100644
@@ -40,4 +40,7 @@ typedef struct bd_info {
 #define bi_memstart bi_dram[0].start
 #define bi_memsize bi_dram[0].size
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_AVR32
+
 #endif /* __ASM_U_BOOT_H__ */

arch/blackfin/include/asm/u-boot.h +3 -0

index a6e6cf0f..9712fc0 100644
@@ -45,4 +45,7 @@ typedef struct bd_info {
 	unsigned long bi_sclk;
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_BLACKFIN
+
 #endif	/* _U_BOOT_H_ */

arch/m68k/include/asm/u-boot.h +3 -0

index a0f2983..0a48bbd 100644
@@ -64,4 +64,7 @@ typedef struct bd_info {
 
 #endif				/* __ASSEMBLY__ */
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_M68K
+
 #endif				/* __U_BOOT_H__ */

arch/microblaze/include/asm/u-boot.h +2 -0

index 543a6b1..21c72d5 100644
@@ -44,5 +44,7 @@ typedef struct bd_info {
 	unsigned long	bi_baudrate;	/* Console Baudrate */
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_MICROBLAZE
 
 #endif	/* _U_BOOT_H_ */

arch/mips/include/asm/u-boot.h +3 -0

index e839ca1..edb87bb 100644
@@ -43,4 +43,7 @@ typedef struct bd_info {
 	unsigned long	bi_flashoffset;	/* reserved area for startup monitor */
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_MIPS
+
 #endif	/* _U_BOOT_H_ */

arch/nios2/include/asm/u-boot.h +2 -0

index ec844d0..f7c70ff 100644
@@ -43,5 +43,7 @@ typedef struct bd_info {
 	unsigned long	bi_baudrate;	/* Console Baudrate */
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_NIOS2
 
 #endif	/* __ASM_NIOS2_U_BOOT_H_ */

arch/powerpc/include/asm/u-boot.h +4 -0

index 721692a..b2fa2b5 100644
@@ -143,4 +143,8 @@ typedef struct bd_info {
 } bd_t;
 
 #endif /* __ASSEMBLY__ */
+
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_PPC
+
 #endif	/* __U_BOOT_H__ */

arch/sh/include/asm/u-boot.h +3 -0

index 27d43b9..4574512 100644
@@ -38,4 +38,7 @@ typedef struct bd_info {
 	unsigned long	bi_boot_params; /* where this board expects params */
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_SH
+
 #endif

arch/sparc/include/asm/u-boot.h +4 -0

index 209873f..1d94087 100644
@@ -59,4 +59,8 @@ typedef struct bd_info {
 } bd_t;
 
 #endif				/* __ASSEMBLY__ */
+
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_SPARC
+
 #endif				/* __U_BOOT_H__ */

arch/x86/include/asm/u-boot.h +3 -0

index a43b3aa..26450eb 100644
@@ -58,4 +58,7 @@ typedef struct bd_info {
 	}bi_dram[CONFIG_NR_DRAM_BANKS];
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_I386
+
 #endif	/* _U_BOOT_H_ */

common/cmd_bootm.c +1 ~~-25~~

index 8909ee7..c2e8038 100644
@@ -165,31 +165,7 @@ void __arch_preboot_os(void)
 }
 void arch_preboot_os(void) __attribute__((weak, alias("__arch_preboot_os")));
 
-#if defined(__ARM__)
-  #define IH_INITRD_ARCH IH_ARCH_ARM
-#elif defined(__avr32__)
-  #define IH_INITRD_ARCH IH_ARCH_AVR32
-#elif defined(__bfin__)
-  #define IH_INITRD_ARCH IH_ARCH_BLACKFIN
-#elif defined(__I386__)
-  #define IH_INITRD_ARCH IH_ARCH_I386
-#elif defined(__M68K__)
-  #define IH_INITRD_ARCH IH_ARCH_M68K
-#elif defined(__microblaze__)
-  #define IH_INITRD_ARCH IH_ARCH_MICROBLAZE
-#elif defined(__mips__)
-  #define IH_INITRD_ARCH IH_ARCH_MIPS
-#elif defined(__nios2__)
-  #define IH_INITRD_ARCH IH_ARCH_NIOS2
-#elif defined(__PPC__)
-  #define IH_INITRD_ARCH IH_ARCH_PPC
-#elif defined(__sh__)
-  #define IH_INITRD_ARCH IH_ARCH_SH
-#elif defined(__sparc__)
-  #define IH_INITRD_ARCH IH_ARCH_SPARC
-#else
-# error Unknown CPU type
-#endif
+#define IH_INITRD_ARCH IH_ARCH_DEFAULT
 
 static void bootm_start_lmb(void)
 {

include/image.h +4 ~~-55~~

72 lines not on this page · raw message

Signature · 1 line

1.7.6.1

Wolfgang Denk

Applied

2011-10-05 18:58 UTC #9 lore raw

PATCH v3 1/1 image: push default arch values to arch headers

Dear Mike Frysinger,

Quoted 10 lines · In message <[email protected]> you wrote:

This pushes the ugly duplicated arch ifdef lists we maintain in various image related files out to the arch headers themselves.
Acked-by Nobuhiro Iwamatsu <[email protected]>
Tested-by Thomas Chou <[email protected]>
Signed-off-by Mike Frysinger <[email protected]>
---
v3
- fix typo in fdt-specific code path

Quoted 14 lines

 arch/arm/include/asm/u-boot.h        |    3 ++
 arch/avr32/include/asm/u-boot.h      |    3 ++
 arch/blackfin/include/asm/u-boot.h   |    3 ++
 arch/m68k/include/asm/u-boot.h       |    3 ++
 arch/microblaze/include/asm/u-boot.h |    2 +
 arch/mips/include/asm/u-boot.h       |    3 ++
 arch/nios2/include/asm/u-boot.h      |    2 +
 arch/powerpc/include/asm/u-boot.h    |    4 ++
 arch/sh/include/asm/u-boot.h         |    3 ++
 arch/sparc/include/asm/u-boot.h      |    4 ++
 arch/x86/include/asm/u-boot.h        |    3 ++
 common/cmd_bootm.c                   |   26 +--------------
 include/image.h                      |   59 ++-------------------------------
 13 files changed, 38 insertions(+), 80 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 4 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 greatest threat towards future is indifference.

A message that is not in the archive (sent off-list or not yet received): [email protected]

Wolfgang Denk

Applied

2011-10-05 18:57 UTC #11 lore raw

PATCH 1/1 MAKEALL: rename coldfire list to m68k to match arch

Dear Mike Frysinger,

Quoted 9 lines · In message <[email protected]> you wrote:

The m68k tree is the only one where ./MAKEALL <arch> does not work. So rename the existing coldfire list in the MAKEALL script to m68k, and add an alias from coldfire to m68k. This makes scripting around MAKEALL easier.
Signed-off-by Mike Frysinger <[email protected]>
---
 MAKEALL |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Applied, thanks.

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
We are all agreed that your  theory  is  crazy.  The  question  which
divides  us  is  whether it is crazy enough to have a chance of being
correct. My own feeling is that it is not crazy enough.  - Niels Bohr