Merge branch '2021-12-01-Kconfig-migrations' into next

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

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 130c769..387971c 100644 (file)
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2015 Linaro
  *
@@ -5,8 +6,6 @@
  *
  * Configuration for HiKey 96boards CE. Parts were derived from other ARM
  * configurations.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __HIKEY_H
@@ -14,19 +13,16 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_POWER
 #define CONFIG_POWER_HI6553
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_SUPPORT_RAW_INITRD
+#define CONFIG_SYS_BOOTM_LEN           SZ_64M
 
 /* Physical Memory Map */
 
 /* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */
-#define CONFIG_SYS_TEXT_BASE           0x35000000
 
-#define CONFIG_NR_DRAM_BANKS           6
 #define PHYS_SDRAM_1                   0x00000000
 
 /* 1008 MB (the last 16Mb are secured for TrustZone by ATF*/
@@ -38,8 +34,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
 
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x80000)
-
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY              19000000
 
@@ -47,34 +41,11 @@
 #define GICD_BASE                      0xf6801000
 #define GICC_BASE                      0xf6802000
 
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + SZ_8M)
-
-/* Serial port PL010/PL011 through the device model */
-#define CONFIG_PL01X_SERIAL
-
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_DWC2_REG_ADDR 0xF72C0000
-/*#define CONFIG_DWC2_DFLT_SPEED_FULL*/
-#define CONFIG_DWC2_ENABLE_DYNAMIC_FIFO
-
-#define CONFIG_MISC_INIT_R
-#endif
-
 #define CONFIG_HIKEY_GPIO
 
-/* SD/MMC configuration */
-#define CONFIG_BOUNCE_BUFFER
-
-/* Command line configuration */
-
-#define CONFIG_MTD_PARTITIONS
-
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#include <config_distro_defaults.h>
-
 /* Initial environment variables */
 
 /*
@@ -96,14 +67,10 @@
                                "initrd_high=0xffffffffffffffff\0" \
                                BOOTENV
 
-/* Preserve environment on sd card */
-#define CONFIG_ENV_SIZE                        0x1000
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
+/* Preserve environment on eMMC */
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_MAXARGS             64      /* max command args */
 
 #endif /* __HIKEY_H */