Commit 731215eb authored by wdenk's avatar wdenk

Patch by George G. Davis, 24 Aug 2004:

- update ARM boards to use constants from mach-types.h
parent b6508513
......@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.1:
======================================================================
* Patch by George G. Davis, 24 Aug 2004:
- update ARM boards to use constants from mach-types.h
* Patch by Gary Jennejohn, 04 Oct 2004:
- fix I2C on at91rm9200
- add support for Ricoh RS5C372A RTC
......
......@@ -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();
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 */
......
......@@ -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;
......
......@@ -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? */
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 */
......
......@@ -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();
......
......@@ -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;
......
......@@ -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;
......
......@@ -32,7 +32,6 @@
*/
#include <common.h>
#include <asm/mach-types.h>
#if defined(CONFIG_OMAP1610)
#include <./configs/omap1510.h>
#endif
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
This diff is collapsed.
......@@ -209,6 +209,7 @@ void inline setenv (char *, char *);
void setenv (char *, char *);
#endif /* CONFIG_PPC */
#ifdef CONFIG_ARM
# include <asm/mach-types.h>
# include <asm/setup.h>
# include <asm/u-boot-arm.h> /* ARM version to be fixed! */
#endif /* CONFIG_ARM */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment