projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
IVML24.h
diff --git
a/include/configs/IVML24.h
b/include/configs/IVML24.h
index
cd100df
..
092fcf0
100644
(file)
--- a/
include/configs/IVML24.h
+++ b/
include/configs/IVML24.h
@@
-36,6
+36,8
@@
#define CONFIG_MPC860 1 /* This is a MPC860 CPU */
#define CONFIG_IVML24 1 /* ...on a IVML24 board */
#define CONFIG_MPC860 1 /* This is a MPC860 CPU */
#define CONFIG_IVML24 1 /* ...on a IVML24 board */
+#define CONFIG_SYS_TEXT_BASE 0xFF000000
+
#if defined (CONFIG_IVML24_16M)
# define CONFIG_IDENT_STRING " IVML24"
#elif defined (CONFIG_IVML24_32M)
#if defined (CONFIG_IVML24_16M)
# define CONFIG_IDENT_STRING " IVML24"
#elif defined (CONFIG_IVML24_32M)
@@
-52,6
+54,8
@@
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#define CONFIG_8xx_GCLK_FREQ 50331648
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#define CONFIG_8xx_GCLK_FREQ 50331648
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
+
#define CONFIG_SHOW_BOOT_PROGRESS 1 /* Show boot progress on LEDs */
#if 0
#define CONFIG_SHOW_BOOT_PROGRESS 1 /* Show boot progress on LEDs */
#if 0
@@
-125,8
+129,6
@@
#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */
#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-
/*
* Low Level Configuration Settings
* (address mappings, register initial values, etc.)
/*
* Low Level Configuration Settings
* (address mappings, register initial values, etc.)
@@
-143,15
+145,14
@@
#define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_IMMR
#if defined (CONFIG_IVML24_16M)
#define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_IMMR
#if defined (CONFIG_IVML24_16M)
-# define CONFIG_SYS_INIT_RAM_
END 0x2F00 /* End of used area in DPRAM
*/
+# define CONFIG_SYS_INIT_RAM_
SIZE 0x2F00 /* Size of used area in DPRAM
*/
#elif defined (CONFIG_IVML24_32M)
#elif defined (CONFIG_IVML24_32M)
-# define CONFIG_SYS_INIT_RAM_
END 0x3000 /* End of used area in DPRAM
*/
+# define CONFIG_SYS_INIT_RAM_
SIZE 0x3000 /* Size of used area in DPRAM
*/
#elif defined (CONFIG_IVML24_64M)
#elif defined (CONFIG_IVML24_64M)
-# define CONFIG_SYS_INIT_RAM_
END 0x3000 /* End of used area in DPRAM
*/
+# define CONFIG_SYS_INIT_RAM_
SIZE 0x3000 /* Size of used area in DPRAM
*/
#endif
#endif
-#define CONFIG_SYS_GBL_DATA_SIZE 64 /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
/*-----------------------------------------------------------------------
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
/*-----------------------------------------------------------------------
@@
-317,6
+318,8
@@
* IDE/ATA stuff
*-----------------------------------------------------------------------
*/
* IDE/ATA stuff
*-----------------------------------------------------------------------
*/
+#define CONFIG_IDE_PREINIT 1 /* Use preinit IDE hook */
+#define CONFIG_IDE_INIT_POSTRESET 1 /* Use postreset IDE hook */
#define CONFIG_IDE_8xx_DIRECT 1 /* PCMCIA interface required */
#define CONFIG_IDE_RESET 1 /* reset for ide supported */
#define CONFIG_IDE_8xx_DIRECT 1 /* PCMCIA interface required */
#define CONFIG_IDE_RESET 1 /* reset for ide supported */
@@
-471,13
+474,4
@@
MBMR_AMB_TYPE_1 | MBMR_DSB_1_CYCL | MBMR_G0CLB_A10 | \
MBMR_RLFB_1X | MBMR_WLFB_1X | MBMR_TLFB_4X)
#endif
MBMR_AMB_TYPE_1 | MBMR_DSB_1_CYCL | MBMR_G0CLB_A10 | \
MBMR_RLFB_1X | MBMR_WLFB_1X | MBMR_TLFB_4X)
#endif
-
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
-#define BOOTFLAG_WARM 0x02 /* Software reboot */
-
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */