env: Finish migration of common ENV options

[platform/kernel/u-boot.git] / include / configs / siemens-am33x-common.h

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 467c5e8..09e4836 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * siemens am33x common board options
  * (C) Copyright 2013 Siemens Schweiz AG
@@ -7,8 +8,6 @@
  * U-Boot file:/include/configs/am335x_evm.h
  *
  * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_SIEMENS_AM33X_COMMON_H
@@ -19,9 +18,7 @@
 #define CONFIG_DMA_COHERENT
 #define CONFIG_DMA_COHERENT_SIZE       (1 << 20)
 
-#define CONFIG_ENV_SIZE                        (0x2000)
 #define CONFIG_SYS_MALLOC_LEN          (16 * 1024 * 1024)
-#define CONFIG_SYS_LONGHELP            /* undef to save memory */
 #ifdef CONFIG_SIEMENS_MACH_TYPE
 #define CONFIG_MACH_TYPE               CONFIG_SIEMENS_MACH_TYPE
 #endif
@@ -32,16 +29,12 @@
 
 /* commands to include */
 
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_ROOTPATH                "/opt/eldk"
 #endif
 
 #define CONFIG_ENV_OVERWRITE           1
 
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_AUTOLOAD    "yes"
 
 /* Clock Defines */
@@ -67,12 +60,7 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x81000000 /* Default load address */
 
-#define CONFIG_SPI
-#define CONFIG_MTD_DEVICE
-#define CONFIG_SF_DEFAULT_SPEED                (75000000)
-
  /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1               /*  1 bank of DRAM */
 #define PHYS_DRAM_1                    0x80000000      /* DRAM Bank #1 */
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_DRAM_1
@@ -91,15 +79,12 @@
 #define CONFIG_SYS_NS16550_COM1                0x44e09000
 #define CONFIG_SYS_NS16550_COM4                0x481a6000
 
-#define CONFIG_SERIAL1                  1
-#define CONFIG_CONS_INDEX               1
 
 /* I2C Configuration */
 #define CONFIG_I2C
 #define CONFIG_SYS_I2C
 
 /* Defines for SPL */
-#define CONFIG_SPL_TEXT_BASE           0x402F0400
 #define CONFIG_SPL_MAX_SIZE            (SRAM_SCRATCH_SPACE_ADDR - \
                                         CONFIG_SPL_TEXT_BASE)
 
@@ -109,9 +94,6 @@
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
-#define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
-
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
@@ -164,8 +146,6 @@
 /*
  * USB configuration
  */
-#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
-
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE        MUSB_PERIPHERAL
 #define CONFIG_AM335X_USB1
@@ -192,32 +172,17 @@
  * 0xE0000 - 0x442000 : Linux Kernel
  * 0x442000 - 0x800000 : Userland
  */
-#if defined(CONFIG_SPI_BOOT)
-# define CONFIG_ENV_SPI_MAX_HZ         CONFIG_SF_DEFAULT_SPEED
-# define CONFIG_ENV_OFFSET             (892 << 10) /* 892 KiB in */
-# define CONFIG_ENV_SECT_SIZE          (4 << 10) /* 4 KB sectors */
-#endif /* SPI support */
-
-#define CONFIG_DRIVER_TI_CPSW
-#define CONFIG_MII
+
 #define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_NET_RETRY_COUNT         10
 
 /* NAND support */
 #ifdef CONFIG_NAND
 /* UBI Support */
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
-#endif
 
 /* Commen environment */
-#define CONFIG_PREBOOT
 #define COMMON_ENV_DFU_ARGS    "dfu_args=run bootargs_defaults;" \
                                "setenv bootargs ${bootargs};" \
                                "mtdparts default;" \
@@ -257,7 +222,6 @@
        "project_dir=targetdir\0" \
        "upgrade_available=0\0" \
        "altbootcmd=run bootcmd\0" \
-       "bootlimit=3\0" \
        "partitionset_active=A\0" \
        "loadaddr=0x82000000\0" \
        "kloadaddr=0x81000000\0" \
@@ -489,7 +453,6 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE     1               /* Max number of NAND
                                                           devices */
 #if !defined(CONFIG_SPI_BOOT)
-#define CONFIG_ENV_OFFSET              0x260000 /* environment starts here */
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
 #endif
 #endif
@@ -498,7 +461,4 @@
 #define CONFIG_RESET_TO_RETRY
 #define CONFIG_BOOT_RETRY_TIME 60
 
-#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTCOUNT_ENV
-
 #endif /* ! __CONFIG_SIEMENS_AM33X_COMMON_H */