Merge git://git.denx.de/u-boot-sunxi

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

diff --git a/include/configs/som-6896.h b/include/configs/som-6896.h
index d058603..f0e8d61 100644 (file)
--- a/include/configs/som-6896.h
+++ b/include/configs/som-6896.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Configuration settings for the SOM-6896
  *
  * Copyright (C) 2015 NovaTech LLC
  * George McCollister <george.mccollister@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -14,19 +13,11 @@
 
 #define CONFIG_SYS_MONITOR_LEN         (1 << 20)
 
-#define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MISC_INIT_R
 
-#define CONFIG_SCSI_DEV_LIST   \
-       {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_AHCI}
-
-#define CONFIG_PCI_PNP
-
 #define VIDEO_IO_OFFSET                        0
 #define CONFIG_X86EMU_RAW_IO
 
-#define CONFIG_ARCH_EARLY_INIT_R
-
 #define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,usbkbd\0" \
                                        "stdout=serial,vidconsole\0" \
                                        "stderr=serial,vidconsole\0"