powerpc: Switch to using CONFIG_SYS_INIT_SP_OFFSET from CONFIG_SYS_GBL_DATA_OFFSET

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

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 206a57a..aaad36b 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -16,9 +16,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_BOOT_RETRY_TIME         900
-#define CONFIG_BOOT_RETRY_MIN          30
-#define CONFIG_RESET_TO_RETRY
 
 #define CONFIG_SYS_SICRH       0x00000000
 #define CONFIG_SYS_SICRL       (SICRL_LBC | SICRL_SPI_D)
@@ -31,10 +28,8 @@
 #define CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR       0xFD000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x1000  /* End of used area in DPRAM */
-#define CONFIG_SYS_GBL_DATA_SIZE       0x100
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE \
-                                        - CONFIG_SYS_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
+#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /*
  * Internal Definitions
@@ -111,14 +106,12 @@
 /*
  * NOR FLASH setup
  */
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_8BIT
 #define CONFIG_FLASH_SHOW_PROGRESS     50
 
 #define CONFIG_SYS_FLASH_BASE          0xFF800000
 #define CONFIG_SYS_FLASH_SIZE          8
 
 
-#define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      128
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000
@@ -164,7 +157,6 @@
  * Ethernet setup
  */
 #ifdef CONFIG_TSEC1
-#define CONFIG_HAS_ETH0
 #define CONFIG_TSEC1_NAME              "TSEC0"
 #define CONFIG_SYS_TSEC1_OFFSET        0x24000
 #define TSEC1_PHY_ADDR                 0x1
@@ -173,14 +165,12 @@
 #endif
 
 #ifdef CONFIG_TSEC2
-#define CONFIG_HAS_ETH1
 #define CONFIG_TSEC2_NAME              "TSEC1"
 #define CONFIG_SYS_TSEC2_OFFSET        0x25000
 #define TSEC2_PHY_ADDR                 0x3
 #define TSEC2_FLAGS                    TSEC_GIGABIT
 #define TSEC2_PHYIDX                   0
 #endif
-#define CONFIG_ETHPRIME                "TSEC1"
 
 /*
  * Serial Port
@@ -200,12 +190,10 @@
 /*
  * U-Boot environment setup
  */
-#define CONFIG_BOOTP_BOOTFILESIZE
 
 /*
  * The reserved memory
  */
-#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (768 * 1024)
 
 /*
@@ -215,7 +203,6 @@
 #define CONFIG_NETDEV                  eth1
 #define CONFIG_HOSTNAME                "ids8313"
 #define CONFIG_ROOTPATH                "/opt/eldk-4.2/ppc_6xx"
-#define CONFIG_BOOTFILE                "ids8313/uImage"
 #define CONFIG_UBOOTPATH               "ids8313/u-boot.bin"
 #define CONFIG_FDTFILE                 "ids8313/ids8313.dtb"
 #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mo,eth1addr:mo"
@@ -226,11 +213,8 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_CBSIZE              1024
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
 #define CONFIG_LOADS_ECHO
-#define CONFIG_TIMESTAMP
 #undef CONFIG_SYS_LOADS_BAUD_CHANGE
 
 /* mtdparts command line support */