diff options
| author | wdenk <wdenk> | 2004-06-09 15:25:53 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-06-09 15:25:53 +0000 |
| commit | 3ff02c27d52c995c327a883e24d11126c6f2dfdf (patch) | |
| tree | be761b3c316771f8a600cb0927e5f41c0fbe6d0a /include | |
| parent | 70f05ac34ee02fe37d8bdcb45301104a4fa35e19 (diff) | |
* Patch by Imre Deak, 26 May 2004:
On OMAP1610 platforms check if booting from RAM(CS0) or flash(CS3).
Set flash base accordingly, and decide whether to do or skip board
specific setup steps.
* Patch by Josef Baumgartner, 26 May 2004:
Add missing define in include/asm-m68k/global_data.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-m68k/global_data.h | 1 | ||||
| -rw-r--r-- | include/configs/omap1610h2.h | 27 | ||||
| -rw-r--r-- | include/configs/omap1610inn.h | 27 |
3 files changed, 39 insertions, 16 deletions
diff --git a/include/asm-m68k/global_data.h b/include/asm-m68k/global_data.h index f8a3d88084..f68352f120 100644 --- a/include/asm-m68k/global_data.h +++ b/include/asm-m68k/global_data.h @@ -56,6 +56,7 @@ typedef struct global_data { */ #define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ #define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ +#define GD_FLG_SILENT 0x00004 /* Silent mode */ #if 0 extern gd_t *global_data; diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h index e512f912a9..b2b0fe721b 100644 --- a/include/configs/omap1610h2.h +++ b/include/configs/omap1610h2.h @@ -142,18 +142,29 @@ /*----------------------------------------------------------------------- * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define PHYS_SDRAM_1 0x10000000 /* SDRAM Bank #1 */ +#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ +#define PHYS_SDRAM_1 0x10000000 /* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x02000000 /* 32 MB */ -#ifdef CONFIG_CS0_BOOT -#define PHYS_FLASH_1 0x0C000000 -#endif -#ifdef CONFIG_CS3_BOOT -#define PHYS_FLASH_1 0x00000000 +#define PHYS_FLASH_1_BM1 0x00000000 /* Flash Bank #1 if booting from flash */ +#define PHYS_FLASH_1_BM0 0x0C000000 /* Flash Bank #1 if booting from RAM */ + +#ifdef CONFIG_CS_AUTOBOOT /* Determine CS assignment in runtime */ + +#ifndef __ASSEMBLY__ +extern unsigned long omap_flash_base; /* set in flash__init */ #endif +#define CFG_FLASH_BASE omap_flash_base + +#elif defined(CONFIG_CS0_BOOT) + +#define CFG_FLASH_BASE PHYS_FLASH_1_BM0 -#define CFG_FLASH_BASE PHYS_FLASH_1 +#else + +#define CFG_FLASH_BASE PHYS_FLASH_1_BM1 + +#endif /*----------------------------------------------------------------------- * FLASH and environment organization diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h index da8043db28..cbf828c56b 100644 --- a/include/configs/omap1610inn.h +++ b/include/configs/omap1610inn.h @@ -147,18 +147,29 @@ /*----------------------------------------------------------------------- * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define PHYS_SDRAM_1 0x10000000 /* SDRAM Bank #1 */ +#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ +#define PHYS_SDRAM_1 0x10000000 /* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x02000000 /* 32 MB */ -#ifdef CONFIG_CS0_BOOT -#define PHYS_FLASH_1 0x0C000000 -#endif -#ifdef CONFIG_CS3_BOOT -#define PHYS_FLASH_1 0x00000000 +#define PHYS_FLASH_1_BM1 0x00000000 /* Flash Bank #1 if booting from flash */ +#define PHYS_FLASH_1_BM0 0x0C000000 /* Flash Bank #1 if booting from RAM */ + +#ifdef CONFIG_CS_AUTOBOOT /* Determine CS assignment in runtime */ + +#ifndef __ASSEMBLY__ +extern unsigned long omap_flash_base; /* set in flash__init */ #endif +#define CFG_FLASH_BASE omap_flash_base + +#elif defined(CONFIG_CS0_BOOT) + +#define CFG_FLASH_BASE PHYS_FLASH_1_BM0 -#define CFG_FLASH_BASE PHYS_FLASH_1 +#else + +#define CFG_FLASH_BASE PHYS_FLASH_1_BM1 + +#endif /*----------------------------------------------------------------------- * FLASH and environment organization |