tegra: remove CONFIG_USB_ETHER_SMSC95XX from boards without it

[u-boot] / include / configs / METROBOX.h

diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index 04ae4f883a64d824878064da486dea6839ca1acf..34376bc4ec4b2c61d566cb561933b70b3c58903f 100644 (file)
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -142,10 +142,9 @@
 #define CONFIG_SYS_TEMP_STACK_OCM    1
 #define CONFIG_SYS_OCM_DATA_ADDR     CONFIG_SYS_ISRAM_BASE
 #define CONFIG_SYS_INIT_RAM_ADDR     CONFIG_SYS_ISRAM_BASE /* Initial RAM address      */
-#define CONFIG_SYS_INIT_RAM_END      0x2000         /* End of used area in RAM */
-#define CONFIG_SYS_GBL_DATA_SIZE     128            /* num bytes initial data  */
+#define CONFIG_SYS_INIT_RAM_SIZE      0x2000        /* Size of used area in RAM */
 
-#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 - 0x4)
 
 #define CONFIG_SYS_MONITOR_LEN       (256 * 1024)   /* Rsrv 256kB for Mon      */
@@ -229,7 +228,6 @@
  *----------------------------------------------------------------------*/
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII           1              /* MII PHY management      */
-#define CONFIG_NET_MULTI      1
 #define CONFIG_PHY_ADDR              0xff           /* no phy on EMAC0         */
 #define CONFIG_PHY1_ADDR      0xff          /* no phy on EMAC1         */
 #define CONFIG_PHY2_ADDR      0x08          /* PHY addr, MGMT, EMAC2   */
@@ -290,7 +288,6 @@
 #define CONFIG_SYS_PROMPT            "MetroBox=> "  /* Monitor Command Prompt  */
 
 #define CONFIG_SYS_HUSH_PARSER        1             /* HUSH for ext'd cli      */
-#define CONFIG_SYS_PROMPT_HUSH_PS2    "> "
 
 
 /*-----------------------------------------------------------------------
@@ -354,14 +351,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20) /* Initial Memory map for Linux */
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD        0x01           /* Normal PowerOn: Boot from FLASH */
-#define BOOTFLAG_WARM        0x02           /* Software reboot */
-
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE  230400        /* kgdb serial port baud   */
 #define CONFIG_KGDB_SER_INDEX 2                     /* kgdb serial port        */