powerpc: Cleanup BOOTFLAG_* references

[platform/kernel/u-boot.git] / include / configs / KUP4K.h

diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h
index 14d412d..9702d63 100644 (file)
--- a/include/configs/KUP4K.h
+++ b/include/configs/KUP4K.h
@@ -38,6 +38,8 @@
 #define CONFIG_MPC855          1       /* This is a MPC855 CPU         */
 #define CONFIG_KUP4K           1       /* ...on a KUP4K module */
 
+#define        CONFIG_SYS_TEXT_BASE    0x40000000
+
 #define CONFIG_8xx_CONS_SMC1   1       /* Console is on SMC1           */
 #undef CONFIG_8xx_CONS_SMC2
 #undef CONFIG_8xx_CONS_NONE
@@ -50,9 +52,9 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                              \
 "slot_a_boot=setenv bootargs root=/dev/sda2 ip=off;"                           \
- "run addhw; mw.b 400000 00 80; diskboot 400000 0:1; bootm 400000\0"            \
+ "run addhw; mw.b 400000 00 80; diskboot 400000 0:1; bootm 400000\0"           \
 "slot_b_boot=setenv bootargs root=/dev/sda2 ip=off;"                           \
- "run addhw; mw.b 400000 00 80; diskboot 400000 2:1; bootm 400000\0"            \
+ "run addhw; mw.b 400000 00 80; diskboot 400000 2:1; bootm 400000\0"           \
 "nfs_boot=mw.b 400000 00 80; dhcp; run nfsargs addip addhw; bootm 400000\0"    \
 "fat_boot=mw.b 400000 00 80; fatload ide 2:1 400000 st.bin; run addhw;         \
  bootm 400000 \0"                                                              \
@@ -105,7 +107,7 @@
  * enable I2C and select the hardware/software driver
  */
 #undef CONFIG_HARD_I2C         /* I2C with hardware support    */
-#define        CONFIG_SOFT_I2C         /* I2C bit-banged               */
+#define        CONFIG_SOFT_I2C         /* I2C bit-banged               */
 
 #define CONFIG_SYS_I2C_SPEED   93000   /* 93 kHz is supposed to work */
 #define CONFIG_SYS_I2C_SLAVE   0xFE
@@ -250,10 +252,10 @@
  * Dynamic MTD partition support
  */
 #define MTDPARTS_DEFAULT       "mtdparts=40000000.flash:256k(u-boot)," \
-                                                "64k(env),"            \
-                                                "128k(splash),"                \
-                                                "512k(etc),"           \
-                                                "64k(hw-info)"
+                                               "64k(env),"             \
+                                               "128k(splash),"         \
+                                               "512k(etc),"            \
+                                               "64k(hw-info)"
 
 /*-----------------------------------------------------------------------
  * Hardware Information Block
@@ -495,19 +497,10 @@
 
 #define LATCH_ADDR 0x90000200
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD  0x01            /* Normal Power-On: Boot from FLASH     */
-#define BOOTFLAG_WARM  0x02            /* Software reboot                      */
-
-
 #define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot */
 #define CONFIG_AUTOBOOT_STOP_STR       "."
 #define CONFIG_SILENT_CONSOLE          1
-#define CONFIG_SYS_DEVICE_NULLDEV      1       /* enble null device            */
+#define CONFIG_SYS_DEVICE_NULLDEV      1       /* enble null device            */
 #define CONFIG_VERSION_VARIABLE                1
 
 /* pass open firmware flat tree */
@@ -515,4 +508,3 @@
 #define CONFIG_OF_BOARD_SETUP  1
 
 #endif /* __CONFIG_H */
-