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

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

diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index 8f0f7f0..4b0d599 100644 (file)
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2013 Broadcom Corporation.
- *
- * SPDX-License-Identifier:      GPL-2.0+
  */
 
 #ifndef __BCM28155_AP_H
@@ -13,30 +12,21 @@
 /* CPU, chip, mach, etc */
 #define CONFIG_KONA
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_GENERIC_BOARD
 
 /*
  * Memory configuration
  */
-#define CONFIG_SYS_TEXT_BASE           0xae000000
 
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
 #define CONFIG_SYS_SDRAM_SIZE          0x80000000
 #define CONFIG_NR_DRAM_BANKS           1
 
 #define CONFIG_SYS_MALLOC_LEN          SZ_4M   /* see armv7/start.S. */
-#define CONFIG_STACKSIZE               SZ_256K
 
 /* GPIO Driver */
 #define CONFIG_KONA_GPIO
 
 /* MMC/SD Driver */
-#define CONFIG_SDHCI
-#define CONFIG_MMC_SDMA
-#define CONFIG_KONA_SDHCI
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_SYS_SDIO_BASE0 SDIO1_BASE_ADDR
 #define CONFIG_SYS_SDIO_BASE1 SDIO2_BASE_ADDR
 #define CONFIG_SYS_SDIO_BASE2 SDIO3_BASE_ADDR
@@ -80,25 +70,19 @@
 #define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_TEXT_BASE
 
 /* Serial Info */
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 /* Post pad 3 bytes after each reg addr */
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         13000000
-#define CONFIG_CONS_INDEX              1
 #define CONFIG_SYS_NS16550_COM1                0x3e000000
 
-#define CONFIG_BAUDRATE                        115200
-
-#define CONFIG_ENV_SIZE                        0x10000
-#define CONFIG_ENV_IS_NOWHERE
-
-#define CONFIG_SYS_NO_FLASH    /* Not using NAND/NOR unmanaged flash */
+/* must fit into GPT:u-boot-env partition */
+#define CONFIG_SYS_MMC_ENV_DEV         0
+#define CONFIG_ENV_OFFSET              (0x00011a00 * 512)
+#define CONFIG_ENV_SIZE                        (8 * 512)
 
 /* console configuration */
 #define CONFIG_SYS_CBSIZE              1024    /* Console buffer size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                       sizeof(CONFIG_SYS_PROMPT) + 16) /* Printbuffer size */
 #define CONFIG_SYS_MAXARGS             64
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
@@ -107,30 +91,14 @@
  * This is necessary for the fatls command to work on an SD card
  * for example.
  */
-#define CONFIG_DOS_PARTITION
 
 /* version string, parser, etc */
-#define CONFIG_VERSION_VARIABLE
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
 
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 
 /* Initial upstream - boot to cmd prompt only */
 #define CONFIG_BOOTCOMMAND             ""
 
-/* Commands */
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_GPIO
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_FAT_WRITE
-
+#define CONFIG_USBID_ADDR              0x34052c46
 
 #endif /* __BCM28155_AP_H */