Remove config_distro_defaults.h

[people/ms/u-boot.git] / include / configs / ls1012a_common.h

diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 57cae9498cbd20565a4664cb436491e814444546..46b3566adf8882bc6a69ed77a3af38fa8d1a1cfd 100644 (file)
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -13,12 +13,8 @@
 #include <asm/arch/config.h>
 #include <asm/arch/stream_id_lsch2.h>
 
-#define CONFIG_SUPPORT_RAW_INITRD
-
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
-#define CONFIG_SYS_TEXT_BASE           0x40100000
-
 #define CONFIG_SYS_CLK_FREQ            125000000
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
@@ -69,6 +65,16 @@
 #define CONFIG_ENV_SECT_SIZE           0x40000
 #endif
 
+/* SATA */
+#define CONFIG_SCSI_AHCI_PLAT
+
+#define CONFIG_SYS_SATA                                AHCI_BASE_ADDR
+
+#define CONFIG_SYS_SCSI_MAX_SCSI_ID            1
+#define CONFIG_SYS_SCSI_MAX_LUN                        1
+#define CONFIG_SYS_SCSI_MAX_DEVICE             (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
+                                               CONFIG_SYS_SCSI_MAX_LUN)
+
 /* I2C */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
@@ -87,6 +93,14 @@
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE           128
 
+#ifndef CONFIG_SPL_BUILD
+#define BOOT_TARGET_DEVICES(func) \
+       func(SCSI, scsi, 0) \
+       func(MMC, mmc, 0) \
+       func(USB, usb, 0)
+#include <config_distro_bootcmd.h>
+#endif
+
 /* Initial environment variables */
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \
@@ -98,18 +112,15 @@
        "kernel_load=0xa0000000\0"              \
        "kernel_size=0x2800000\0"               \
 
+#undef CONFIG_BOOTCOMMAND
 #define CONFIG_BOOTCOMMAND             "sf probe 0:0; sf read $kernel_load "\
                                        "$kernel_start $kernel_size && "\
                                        "bootm $kernel_load"
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING         1
-#define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_MAXARGS             64      /* max command args */
 
-#define CONFIG_PANIC_HANG
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
 #include <asm/arch/soc.h>