Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOT

[platform/kernel/u-boot.git] / include / configs / conga-qeval20-qa3-e3845.h

diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 4c37d5e..1978074 100644 (file)
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -14,51 +13,31 @@
 #include <configs/x86-common.h>
 
 #define CONFIG_SYS_MONITOR_LEN         (1 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_ARCH_EARLY_INIT_R
-#define CONFIG_ARCH_MISC_INIT
-
-#define CONFIG_PCI_PNP
 
 #define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
                                        "stdout=serial\0" \
                                        "stderr=serial\0"
 
-#define CONFIG_SCSI_DEV_LIST           \
-       {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
-       {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
-
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC_SDMA
-
-#undef CONFIG_USB_MAX_CONTROLLER_COUNT
-#define CONFIG_USB_MAX_CONTROLLER_COUNT                1
-
 #define VIDEO_IO_OFFSET                                0
 #define CONFIG_X86EMU_RAW_IO
-#define CONFIG_CMD_BMP
 
 #define CONFIG_ENV_SECT_SIZE           0x1000
-#define CONFIG_ENV_OFFSET              0x007fe000
+#define CONFIG_ENV_OFFSET              0x006ef000
 
-#undef CONFIG_BOOTARGS
 #undef CONFIG_BOOTCOMMAND
-
-#define CONFIG_BOOTARGS                \
-       "root=/dev/sda1 ro quiet"
 #define CONFIG_BOOTCOMMAND     \
-       "load scsi 0:1 03000000 /boot/vmlinuz-4.2.0-26-generic;" \
-       "load scsi 0:1 04000000 /boot/initrd.img-4.2.0-26-generic;" \
+       "load scsi 0:2 03000000 /boot/vmlinuz-${kernel-ver}-generic;"   \
+       "load scsi 0:2 04000000 /boot/initrd.img-${kernel-ver}-generic;" \
        "run boot"
 
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
+       "kernel-ver=4.4.0-22\0"                                 \
        "boot=zboot 03000000 0 04000000 ${filesize}\0"          \
        "upd_uboot=tftp 100000 conga/u-boot.rom;"               \
-               "sf probe;sf update 100000 0 7fe000\0"
+               "sf probe;sf update 100000 0 800000;saveenv\0"
 
+#define CONFIG_USE_PREBOOT
 #define CONFIG_PREBOOT
 
 #endif /* __CONFIG_H */