Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

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

diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index c06f005..8553ea0 100644 (file)
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.h
@@ -11,54 +11,20 @@
 #ifndef _CONFIG_DS109_H
 #define _CONFIG_DS109_H
 
-/* Provide the MACH_TYPE value that the vendor kernel requires. */
-#define CONFIG_MACH_TYPE               527
-
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
-
-/*
- * Commands configuration
- */
-#define CONFIG_CMD_EXT2
-
-/*
- * mv-plug-common.h should be defined after CMD configs since it used them
- * to enable certain macros
- */
-#include "mv-plug-common.h"
+#include "mv-common.h"
 
 /*
  *  Environment variables configurations
  */
-#ifdef CONFIG_SPI_FLASH
-#define CONFIG_ENV_SECT_SIZE           0x10000 /* 64k */
-#endif
-
-#ifdef CONFIG_CMD_SF
-#define CONFIG_HARD_SPI                        1
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          50000000 /* 50 MHz */
-#endif
 
 /*
  * max 4k env size is enough, but in case of nand
  * it has to be rounded to sector size
  */
-#define CONFIG_ENV_SIZE                        0x10000
-#define CONFIG_ENV_ADDR                        0x3d0000
-#define CONFIG_ENV_OFFSET              0x3d0000 /* env starts here */
 
 /*
  * Default environment variables
  */
-#define CONFIG_BOOTCOMMAND             "setenv ethact egiga0; " \
-       "${x_bootcmd_ethernet}; ${x_bootcmd_usb}; ${x_bootcmd_kernel}; "\
-       "setenv bootargs ${x_bootargs} ${x_bootargs_root}; "    \
-       "bootm 0x6400000;"
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "x_bootcmd_ethernet=ping 192.168.1.2\0" \
@@ -66,7 +32,8 @@
        "x_bootcmd_kernel=fatload usb 0 0x6400000 uImage\0" \
        "x_bootargs=console=ttyS0,115200\0"     \
        "x_bootargs_root=root=/dev/sda2 rootdelay=10\0" \
-       "ipaddr=192.168.1.5\0"
+       "ipaddr=192.168.1.5\0"          \
+       "usb0Mode=host\0"
 
 /*
  * Ethernet Driver configuration
@@ -76,11 +43,4 @@
 #define CONFIG_PHY_BASE_ADR    8
 #endif /* CONFIG_CMD_NET */
 
-/*
- * SATA Driver configuration
- */
-#ifdef CONFIG_MVSATA_IDE
-#define CONFIG_SYS_ATA_IDE0_OFFSET     MV_SATA_PORT0_OFFSET
-#endif /*CONFIG_MVSATA_IDE*/
-
 #endif /* _CONFIG_DS109_H */