diff options
author | wdenk <wdenk> | 2004-10-10 18:41:04 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2004-10-10 18:41:04 +0000 |
commit | 731215ebde3b85f114f7a45eece3c155ba49a2c0 (patch) | |
tree | 5e99a2b6ba94dddc854d6fa805a2e0174e26a521 /board | |
parent | b65085130aed33584d95502c20317ad4379c1ca6 (diff) | |
download | u-boot-imx-731215ebde3b85f114f7a45eece3c155ba49a2c0.zip u-boot-imx-731215ebde3b85f114f7a45eece3c155ba49a2c0.tar.gz u-boot-imx-731215ebde3b85f114f7a45eece3c155ba49a2c0.tar.bz2 |
Patch by George G. Davis, 24 Aug 2004:
- update ARM boards to use constants from mach-types.h
Diffstat (limited to 'board')
33 files changed, 33 insertions, 39 deletions
diff --git a/board/assabet/assabet.c b/board/assabet/assabet.c index 0958c33..d3ccbb5 100644 --- a/board/assabet/assabet.c +++ b/board/assabet/assabet.c @@ -101,7 +101,7 @@ board_init(void) { DECLARE_GLOBAL_DATA_PTR; - gd->bd->bi_arch_number = 25; /* Intel Assabet Board */ + gd->bd->bi_arch_number = MACH_TYPE_ASSABET; gd->bd->bi_boot_params = 0xc0000100; neponset_init(); diff --git a/board/at91rm9200dk/at91rm9200dk.c b/board/at91rm9200dk/at91rm9200dk.c index 606ea48..2cb60b0 100644 --- a/board/at91rm9200dk/at91rm9200dk.c +++ b/board/at91rm9200dk/at91rm9200dk.c @@ -45,7 +45,7 @@ int board_init (void) /* so we do _nothing_ here */ /* arch number of AT91RM9200DK-Board */ - gd->bd->bi_arch_number = 251; + gd->bd->bi_arch_number = MACH_TYPE_AT91RM9200; /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; diff --git a/board/cerf250/cerf250.c b/board/cerf250/cerf250.c index 63745b4..cc1bc16 100644 --- a/board/cerf250/cerf250.c +++ b/board/cerf250/cerf250.c @@ -42,7 +42,7 @@ int board_init (void) /* so we do _nothing_ here */ /* arch number of cerf PXA Board */ - gd->bd->bi_arch_number = 139; + gd->bd->bi_arch_number = MACH_TYPE_PXA_CERF; /* adress of boot parameters */ gd->bd->bi_boot_params = 0xa0000100; diff --git a/board/cradle/cradle.c b/board/cradle/cradle.c index f5c99b1..6f65f32 100644 --- a/board/cradle/cradle.c +++ b/board/cradle/cradle.c @@ -186,7 +186,7 @@ board_init (void) led_code (0xf, YELLOW); /* arch number of HHP Cradle */ - gd->bd->bi_arch_number = 174; + gd->bd->bi_arch_number = MACH_TYPE_HHP_CRADLE; /* adress of boot parameters */ gd->bd->bi_boot_params = 0xa0000100; diff --git a/board/csb226/csb226.c b/board/csb226/csb226.c index bf9b4f8..c99a715 100644 --- a/board/csb226/csb226.c +++ b/board/csb226/csb226.c @@ -71,7 +71,7 @@ int board_init (void) /* so we do _nothing_ here */ /* arch number of CSB226 board */ - gd->bd->bi_arch_number = 216; + gd->bd->bi_arch_number = MACH_TYPE_CSB226; /* adress of boot parameters */ gd->bd->bi_boot_params = 0xa0000100; diff --git a/board/dave/B2/B2.c b/board/dave/B2/B2.c index a6ab917..29676b8 100644 --- a/board/dave/B2/B2.c +++ b/board/dave/B2/B2.c @@ -109,7 +109,7 @@ int board_init (void) PDATF = temp; /* arch number MACH_TYPE_MBA44B0 */ - gd->bd->bi_arch_number = 178; + gd->bd->bi_arch_number = MACH_TYPE_S3C44B0; /* location of boot parameters */ gd->bd->bi_boot_params = 0x0c000100; diff --git a/board/dnp1110/dnp1110.c b/board/dnp1110/dnp1110.c index 4a2b44e..24c3e00 100644 --- a/board/dnp1110/dnp1110.c +++ b/board/dnp1110/dnp1110.c @@ -39,7 +39,7 @@ int board_init (void) /* so we do _nothing_ here */ /* arch number of DNP1110-Board */ - gd->bd->bi_arch_number = 255; + gd->bd->bi_arch_number = MACH_TYPE_DNP1110; /* flash vpp on */ PPDR |= 0x80; /* assumes LCD controller is off */ diff --git a/board/ep7312/ep7312.c b/board/ep7312/ep7312.c index 4f9e5ac..11eab23 100644 --- a/board/ep7312/ep7312.c +++ b/board/ep7312/ep7312.c @@ -40,7 +40,7 @@ int board_init (void) IO_LEDFLSH = 0x40; /* arch number MACH_TYPE_EDB7312 */ - gd->bd->bi_arch_number = 131; + gd->bd->bi_arch_number = MACH_TYPE_EDB7312; /* location of boot parameters */ gd->bd->bi_boot_params = 0xc0020100; diff --git a/board/gcplus/gcplus.c b/board/gcplus/gcplus.c index 06b6098..261e894 100644 --- a/board/gcplus/gcplus.c +++ b/board/gcplus/gcplus.c @@ -37,7 +37,7 @@ board_init(void) { DECLARE_GLOBAL_DATA_PTR; - gd->bd->bi_arch_number = 29; /* ADS GraphicsClientPlus Board */ + gd->bd->bi_arch_number = MACH_TYPE_GRAPHICSCLIENT; gd->bd->bi_boot_params = 0xc000003c; /* Weird address? */ diff --git a/board/impa7/impa7.c b/board/impa7/impa7.c index 12eb0db..e496923 100644 --- a/board/impa7/impa7.c +++ b/board/impa7/impa7.c @@ -40,7 +40,7 @@ int board_init (void) IO_LEDFLSH = 0x40; /* arch number of EP7111 */ - gd->bd->bi_arch_number = 50; + gd->bd->bi_arch_number = MACH_TYPE_EDB7211; /* location of boot parameters for EP7111 */ gd->bd->bi_boot_params = 0xc0020100; diff --git a/board/integratorap/integratorap.c b/board/integratorap/integratorap.c index 3ab74f0..fb83c82 100644 --- a/board/integratorap/integratorap.c +++ b/board/integratorap/integratorap.c @@ -68,7 +68,7 @@ int board_init (void) DECLARE_GLOBAL_DATA_PTR; /* arch number of Integrator Board */ - gd->bd->bi_arch_number = 21; + gd->bd->bi_arch_number = MACH_TYPE_INTEGRATOR; /* adress of boot parameters */ gd->bd->bi_boot_params = 0x00000100; diff --git a/board/integratorcp/integratorcp.c b/board/integratorcp/integratorcp.c index 8da869c..6fe8f05 100644 --- a/board/integratorcp/integratorcp.c +++ b/board/integratorcp/integratorcp.c @@ -64,7 +64,7 @@ int board_init (void) DECLARE_GLOBAL_DATA_PTR; /* arch number of Integrator Board */ - gd->bd->bi_arch_number = 275; + gd->bd->bi_arch_number = MACH_TYPE_CINTEGRATOR; /* adress of boot parameters */ gd->bd->bi_boot_params = 0x00000100; diff --git a/board/ixdp425/ixdp425.c b/board/ixdp425/ixdp425.c index 1b34f96..09e5fdf 100644 --- a/board/ixdp425/ixdp425.c +++ b/board/ixdp425/ixdp425.c @@ -54,7 +54,7 @@ board_init (void) DECLARE_GLOBAL_DATA_PTR; /* arch number of IXDP */ - gd->bd->bi_arch_number = 245; + gd->bd->bi_arch_number = MACH_TYPE_IXDP425; /* adress of boot parameters */ gd->bd->bi_boot_params = 0x00000100; diff --git a/board/lart/lart.c b/board/lart/lart.c index 20f22ea..66b730d 100644 --- a/board/lart/lart.c +++ b/board/lart/lart.c @@ -39,7 +39,7 @@ int board_init (void) /* so we do _nothing_ here */ /* arch number of LART-Board */ - gd->bd->bi_arch_number = 27; + gd->bd->bi_arch_number = MACH_TYPE_LART; /* adress of boot parameters */ gd->bd->bi_boot_params = 0xc0000100; diff --git a/board/lubbock/lubbock.c b/board/lubbock/lubbock.c index 353c722..e618ab9 100644 --- a/board/lubbock/lubbock.c +++ b/board/lubbock/lubbock.c @@ -42,7 +42,7 @@ int board_init (void) /* so we do _nothing_ here */ /* arch number of Lubbock-Board */ - gd->bd->bi_arch_number = 89; + gd->bd->bi_arch_number = MACH_TYPE_LUBBOCK; /* adress of boot parameters */ gd->bd->bi_boot_params = 0xa0000100; diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c index db98553..ffdba5d 100644 --- a/board/mpl/vcma9/vcma9.c +++ b/board/mpl/vcma9/vcma9.c @@ -119,7 +119,7 @@ int board_init(void) serial_init(); /* arch number of VCMA9-Board */ - gd->bd->bi_arch_number = 227; + gd->bd->bi_arch_number = MACH_TYPE_MPL_VCMA9; /* adress of boot parameters */ gd->bd->bi_boot_params = 0x30000100; diff --git a/board/mx1ads/mx1ads.c b/board/mx1ads/mx1ads.c index 661fbab..332f0a2 100644 --- a/board/mx1ads/mx1ads.c +++ b/board/mx1ads/mx1ads.c @@ -114,7 +114,7 @@ int board_init (void) { SetAsynchMode(); - gd->bd->bi_arch_number = 160; /* Arch number of MX1ADS Board */ + gd->bd->bi_arch_number = MACH_TYPE_MX1ADS; gd->bd->bi_boot_params = 0x08000100; /* adress of boot parameters */ diff --git a/board/mx1fs2/mx1fs2.c b/board/mx1fs2/mx1fs2.c index f51085a..9e7a06c 100644 --- a/board/mx1fs2/mx1fs2.c +++ b/board/mx1fs2/mx1fs2.c @@ -81,7 +81,7 @@ board_init(void) { DECLARE_GLOBAL_DATA_PTR; - gd->bd->bi_arch_number = 470; + gd->bd->bi_arch_number = MACH_TYPE_MX1FS2; gd->bd->bi_boot_params = 0x08000100; serial_init(); logo_init(); diff --git a/board/ns9750dev/ns9750dev.c b/board/ns9750dev/ns9750dev.c index 0ea89a5..ea00d5a 100644 --- a/board/ns9750dev/ns9750dev.c +++ b/board/ns9750dev/ns9750dev.c @@ -65,7 +65,7 @@ int board_init( void ) /* Active BBUS modules */ *get_bbus_reg_addr( NS9750_BBUS_MASTER_RESET ) = 0; -#warning TODO check numbers +#warning Please register your machine at http://www.arm.linux.org.uk/developer/machines/?action=new /* arch number of OMAP 1510-Board */ /* to be changed for OMAP 1610 Board */ gd->bd->bi_arch_number = 234; diff --git a/board/omap1510inn/omap1510innovator.c b/board/omap1510inn/omap1510innovator.c index eba010a..f037f42 100644 --- a/board/omap1510inn/omap1510innovator.c +++ b/board/omap1510inn/omap1510innovator.c @@ -50,7 +50,7 @@ int board_init (void) DECLARE_GLOBAL_DATA_PTR; /* arch number of OMAP 1510-Board */ - gd->bd->bi_arch_number = 234; + gd->bd->bi_arch_number = MACH_TYPE_OMAP_INNOVATOR; /* adress of boot parameters */ gd->bd->bi_boot_params = 0x10000100; diff --git a/board/omap1610inn/omap1610innovator.c b/board/omap1610inn/omap1610innovator.c index 57f1e89..7842518 100644 --- a/board/omap1610inn/omap1610innovator.c +++ b/board/omap1610inn/omap1610innovator.c @@ -32,7 +32,6 @@ */ #include <common.h> -#include <asm/mach-types.h> #if defined(CONFIG_OMAP1610) #include <./configs/omap1510.h> #endif diff --git a/board/omap5912osk/omap5912osk.c b/board/omap5912osk/omap5912osk.c index 27457a1..1faa084 100644 --- a/board/omap5912osk/omap5912osk.c +++ b/board/omap5912osk/omap5912osk.c @@ -60,9 +60,7 @@ int board_init (void) { DECLARE_GLOBAL_DATA_PTR; - /* arch number of OMAP 1510-Board */ - /* to be changed for OMAP 1610 Board */ - gd->bd->bi_arch_number = 234; + gd->bd->bi_arch_number = MACH_TYPE_OMAP_OSK; /* adress of boot parameters */ gd->bd->bi_boot_params = 0x10000100; diff --git a/board/omap730p2/omap730p2.c b/board/omap730p2/omap730p2.c index 870cb91..256c6a6 100644 --- a/board/omap730p2/omap730p2.c +++ b/board/omap730p2/omap730p2.c @@ -87,7 +87,7 @@ int board_init (void) DECLARE_GLOBAL_DATA_PTR; /* arch number of OMAP 730 P2 Board - Same as the Innovator! */ - gd->bd->bi_arch_number = 491; + gd->bd->bi_arch_number = MACH_TYPE_OMAP_PERSEUS2; /* adress of boot parameters */ gd->bd->bi_boot_params = 0x10000100; diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c index a1fe0ae..3ed8753 100644 --- a/board/scb9328/scb9328.c +++ b/board/scb9328/scb9328.c @@ -29,7 +29,7 @@ int board_init( void ){ DECLARE_GLOBAL_DATA_PTR; - gd->bd->bi_arch_number = 508; + gd->bd->bi_arch_number = MACH_TYPE_SCB9328; gd->bd->bi_boot_params = 0x08000100; return 0; diff --git a/board/shannon/shannon.c b/board/shannon/shannon.c index c090bde..0d9f146 100644 --- a/board/shannon/shannon.c +++ b/board/shannon/shannon.c @@ -63,7 +63,7 @@ int board_init (void) #endif /* CONFIG_INFERNO */ /* arch number for shannon */ - gd->bd->bi_arch_number = 97; + gd->bd->bi_arch_number = MACH_TYPE_SHANNON; /* adress of boot parameters */ gd->bd->bi_boot_params = 0xc0000100; diff --git a/board/smdk2400/smdk2400.c b/board/smdk2400/smdk2400.c index 2d6be31..cb70218 100644 --- a/board/smdk2400/smdk2400.c +++ b/board/smdk2400/smdk2400.c @@ -77,7 +77,7 @@ int board_init (void) gpio->OPENCR = 0x0; /* arch number of SAMSUNG-Board to MACH_TYPE_SMDK2400 */ - gd->bd->bi_arch_number = 145; + gd->bd->bi_arch_number = MACH_TYPE_SMDK2400; /* adress of boot parameters */ gd->bd->bi_boot_params = 0x0C000100; diff --git a/board/smdk2410/smdk2410.c b/board/smdk2410/smdk2410.c index 207cd44..9623aef 100644 --- a/board/smdk2410/smdk2410.c +++ b/board/smdk2410/smdk2410.c @@ -104,7 +104,7 @@ int board_init (void) gpio->GPHUP = 0x000007FF; /* arch number of SMDK2410-Board */ - gd->bd->bi_arch_number = 193; + gd->bd->bi_arch_number = MACH_TYPE_SMDK2410; /* adress of boot parameters */ gd->bd->bi_boot_params = 0x30000100; diff --git a/board/sx1/sx1.c b/board/sx1/sx1.c index c14a385..e45f6ae 100644 --- a/board/sx1/sx1.c +++ b/board/sx1/sx1.c @@ -46,7 +46,7 @@ int board_init (void) DECLARE_GLOBAL_DATA_PTR; /* arch number of SX1 Board */ - gd->bd->bi_arch_number = 241; + gd->bd->bi_arch_number = MACH_TYPE_SX1; /* adress of boot parameters */ gd->bd->bi_boot_params = 0x10000100; diff --git a/board/trab/trab.c b/board/trab/trab.c index fb57f5b..e8dfd2c 100644 --- a/board/trab/trab.c +++ b/board/trab/trab.c @@ -57,7 +57,7 @@ static void udelay_no_timer (int usec) int i; int delay = usec * 3; - for (i = 0; i < delay; i ++) gd->bd->bi_arch_number = 145; + for (i = 0; i < delay; i ++) gd->bd->bi_arch_number = MACH_TYPE_TRAB; } #endif /* CONFIG_MODEM_SUPPORT */ @@ -109,10 +109,7 @@ int board_init () gpio->MISCCR = 0x40; gpio->PFCON |= (2<<12); - /* arch number of SAMSUNG-Board */ - /* MACH_TYPE_SMDK2400 */ - /* XXX this isn't really correct, but keep it for now */ - gd->bd->bi_arch_number = 145; + gd->bd->bi_arch_number = MACH_TYPE_TRAB; /* adress of boot parameters */ gd->bd->bi_boot_params = 0x0c000100; diff --git a/board/versatile/versatile.c b/board/versatile/versatile.c index 17701dc..0274027 100644 --- a/board/versatile/versatile.c +++ b/board/versatile/versatile.c @@ -74,7 +74,7 @@ int board_init (void) (VERSATILE_TIMCLK << VERSATILE_TIMER3_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER4_EnSel)); /* arch number of Versatile Board */ - gd->bd->bi_arch_number = 387; + gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB; /* adress of boot parameters */ gd->bd->bi_boot_params = 0x00000100; diff --git a/board/wepep250/wepep250.c b/board/wepep250/wepep250.c index 5818183..56cb855 100644 --- a/board/wepep250/wepep250.c +++ b/board/wepep250/wepep250.c @@ -26,7 +26,7 @@ int board_init( void ){ DECLARE_GLOBAL_DATA_PTR; - gd->bd->bi_arch_number = 288; + gd->bd->bi_arch_number = MACH_TYPE_WEP_EP250; gd->bd->bi_boot_params = 0xa0000000; /* * Setup GPIO stuff to get serial working diff --git a/board/xm250/xm250.c b/board/xm250/xm250.c index 2a4348d..ef5e9da 100644 --- a/board/xm250/xm250.c +++ b/board/xm250/xm250.c @@ -63,7 +63,7 @@ board_init (void) { DECLARE_GLOBAL_DATA_PTR; /* arch number of MicroSys XM250 */ - gd->bd->bi_arch_number = 444; + gd->bd->bi_arch_number = MACH_TYPE_XM250; /* adress of boot parameters */ gd->bd->bi_boot_params = 0xa0000100; diff --git a/board/xsengine/xsengine.c b/board/xsengine/xsengine.c index c33b6f0..a9919db 100644 --- a/board/xsengine/xsengine.c +++ b/board/xsengine/xsengine.c @@ -39,7 +39,7 @@ int board_init (void) /* so we do _nothing_ here */ /* arch number */ - gd->bd->bi_arch_number = 532; + gd->bd->bi_arch_number = MACH_TYPE_XSENGINE; /* adress of boot parameters */ gd->bd->bi_boot_params = 0xa0000100; |