am33xx: tx48: config cleanup

[karo-tx-uboot.git] / include / configs / highbank.h

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 56047330361f96ca52bd41fd125dfeb414a5866f..62cc08cebd388c06274cec673d22b89ffb53c3d2 100644 (file)
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -39,7 +39,11 @@
 #define CONFIG_CONS_INDEX              0
 
 #define CONFIG_BAUDRATE                        38400
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
+
+#define CONFIG_BOOTCOUNT_LIMIT
+#define CONFIG_SYS_BOOTCOUNT_SINGLEWORD
+#define CONFIG_SYS_BOOTCOUNT_LE                /* Use little-endian accessors */
+#define CONFIG_SYS_BOOTCOUNT_ADDR      0xfff3cf0c
 
 #define CONFIG_MISC_INIT_R
 #define CONFIG_SCSI_AHCI
@@ -90,23 +94,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x800000
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
-               "fdtaddr_r=0x600000\0" \
-               "pxefile_addr_r=0x700000\0" \
-               "kernel_addr_r=0x800000\0" \
-               "ramdisk_addr_r=0x01000000\0" \
-
-/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE               (128*1024)      /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ           (4*1024)        /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ           (4*1024)        /* FIQ stack */
-#endif
-
 /*-----------------------------------------------------------------------
  * Physical Memory Map
  */
@@ -115,12 +102,16 @@
 #define CONFIG_SYS_MEMTEST_START       0x100000
 #define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_1_SIZE - 0x100000)
 
-/* Room required on the stack for the environment data */
-#define CONFIG_ENV_SIZE                        0x2000
-#define CONFIG_ENV_IS_NOWHERE
+/* Environment data setup
+*/
+#define CONFIG_ENV_IS_IN_NVRAM
+#define CONFIG_SYS_NVRAM_BASE_ADDR     0xfff88000      /* NVRAM base address */
+#define CONFIG_SYS_NVRAM_SIZE          0x8000          /* NVRAM size */
+#define CONFIG_ENV_SIZE                        0x2000          /* Size of Environ */
+#define CONFIG_ENV_ADDR                        CONFIG_SYS_NVRAM_BASE_ADDR
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_TEXT_BASE           0x00001000
+#define CONFIG_SYS_TEXT_BASE           0x00008000
 #define CONFIG_SYS_INIT_SP_ADDR                0x01000000
 #define CONFIG_SKIP_LOWLEVEL_INIT