power: pmic: Guard non-DM_PMIC drivers with a check for POWER_LEGACY
Subsystems (59)
PATCH 21/41 global: Remove unused CONFIG symbols
In reply to Tom RiniThis removes the following unreferenced CONFIG symbols:
CONFIG_FDTADDR
CONFIG_FDTFILE
CONFIG_FLASH_SECTOR_SIZE
CONFIG_FSL_CPLD CONFIG_HDMI_ENCODER_I2C_ADDR CONFIG_I2C_MVTWSI
CONFIG_I2C_RTC_ADDR
CONFIG_IRAM_END
CONFIG_IRAM_SIZE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE CONFIG_L1_INIT_RAM
CONFIG_MACB_SEARCH_PHY CONFIG_MIU_2BIT_21_7_INTERLEAVED CONFIG_MTD_NAND_VERIFY_WRITE CONFIG_MVGBE_PORTS
CONFIG_NETDEV
CONFIG_NUM_DSP_CPUS
CONFIG_PHY_BASE_ADR CONFIG_PHY_INTERFACE_MODE
CONFIG_PSRAM_SCFG
CONFIG_RAMBOOT_SPIFLASH CONFIG_RAMBOOT_TEXT_BASE
CONFIG_RD_LVL CONFIG_ROCKCHIP_SDHCI_MAX_FREQ CONFIG_SETUP_INITRD_TAG
CONFIG_SH_QSPI_BASE
CONFIG_SMDK5420
CONFIG_SOCRATES
CONFIG_SPI_ADDR
CONFIG_SPI_FLASH_QUAD
CONFIG_SPI_FLASH_SIZE CONFIG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET CONFIG_TEGRA_SLINK_CTRLS CONFIG_TPM_TIS_BASE_ADDRESS CONFIG_UBOOT_SECTOR_COUNT CONFIG_UBOOT_SECTOR_START CONFIG_VAR_SIZE_SPL
CONFIG_VERY_BIG_RAM
And also:
BL1_SIZE
PHY_NO
RESERVE_BLOCK_SIZE
--- README | 11 ----------- arch/arm/include/asm/arch-ls102xa/config.h | 1 - arch/arm/mach-mvebu/include/mach/config.h | 9 --------- arch/powerpc/include/asm/config_mpc85xx.h | 1 - arch/xtensa/include/asm/config.h | 1 - board/Marvell/openrd/openrd.c | 2 +- drivers/net/mvgbe.c | 4 ---- drivers/net/mvgbe.h | 7 ------- drivers/ram/mpc83xx_sdram.c | 7 +------ include/configs/MPC837XERDB.h | 8 +++----- include/configs/P1010RDB.h | 1 - include/configs/P2041RDB.h | 9 ++------- include/configs/SBx81LIFKW.h | 9 --------- include/configs/SBx81LIFXCAT.h | 9 --------- include/configs/T102xRDB.h | 2 -- include/configs/T104xRDB.h | 4 ---- include/configs/T208xQDS.h | 2 -- include/configs/T208xRDB.h | 2 -- include/configs/T4240RDB.h | 3 --- include/configs/alt.h | 3 --- include/configs/ax25-ae350.h | 3 --- include/configs/beaver.h | 4 ---- include/configs/blanche.h | 4 +--- include/configs/cardhu.h | 4 ---- include/configs/cei-tk1-som.h | 3 --- include/configs/colibri_vf.h | 4 ---- include/configs/dalmore.h | 3 --- include/configs/dns325.h | 7 ------- include/configs/dockstar.h | 6 ------ include/configs/dra7xx_evm.h | 1 - include/configs/dreamplug.h | 6 ------ include/configs/ds109.h | 8 -------- include/configs/eb_cpu5282.h | 8 -------- include/configs/efi-x86_app.h | 2 -- include/configs/embestmx6boards.h | 6 +++--- include/configs/ethernut5.h | 1 - include/configs/exynos5-common.h | 2 -- include/configs/exynos5420-common.h | 2 -- include/configs/exynos7420-common.h | 4 ---- include/configs/goflexhome.h | 6 ------ include/configs/guruplug.h | 8 -------- include/configs/ib62x0.h | 8 -------- include/configs/iconnect.h | 10 ---------- include/configs/jetson-tk1.h | 5 ----- include/configs/k2e_evm.h | 1 - include/configs/k2g_evm.h | 1 - include/configs/k2l_evm.h | 1 - include/configs/kmcent2.h | 1 - include/configs/kontron_sl28.h | 1 - include/configs/lacie_kw.h | 7 ------- include/configs/legoev3.h | 1 - include/configs/ls1028a_common.h | 1 - include/configs/ls1043a_common.h | 1 - include/configs/ls1043aqds.h | 1 - include/configs/ls1043ardb.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/ls1046afrwy.h | 1 - include/configs/ls1046aqds.h | 1 - include/configs/ls1046ardb.h | 1 - include/configs/ls1088a_common.h | 1 - include/configs/ls1088aqds.h | 1 - include/configs/ls1088ardb.h | 1 - include/configs/ls2080a_common.h | 1 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/lx2160a_common.h | 1 - include/configs/malta.h | 2 -- include/configs/mt7621.h | 1 - include/configs/mt7629.h | 5 +---- include/configs/mxs.h | 5 ----- include/configs/nas220.h | 12 ------------ include/configs/nsa310s.h | 4 ---- include/configs/nyan-big.h | 3 --- include/configs/openrd.h | 22 ---------------------- include/configs/origen.h | 6 ------ include/configs/p2371-0000.h | 3 --- include/configs/p2371-2180.h | 3 --- include/configs/p2571.h | 3 --- include/configs/p3450-0000.h | 3 --- include/configs/pm9263.h | 5 ----- include/configs/pogo_e02.h | 6 ------ include/configs/pogo_v4.h | 6 ------ include/configs/porter.h | 3 --- include/configs/qemu-ppce500.h | 1 - include/configs/rcar-gen3-common.h | 1 - include/configs/rk3399_common.h | 10 ---------- include/configs/sheevaplug.h | 6 ------ include/configs/silk.h | 3 --- include/configs/smdk5420.h | 2 -- include/configs/smdkv310.h | 3 --- include/configs/socfpga_sr1500.h | 6 ------ include/configs/socrates.h | 4 ---- include/configs/stout.h | 3 --- include/configs/synquacer.h | 1 - include/configs/tec-ng.h | 6 ------ include/configs/venice2.h | 3 --- include/configs/vinco.h | 3 --- include/configs/x86-common.h | 16 ---------------- include/configs/xpress.h | 7 ++----- 99 files changed, 14 insertions(+), 391 deletions(-)
README +0 -11
@@ -373,12 +373,6 @@ The following options need to be configured: such as ARM architectural timer initialization. - Linux Kernel Interface: - CONFIG_MEMSIZE_IN_BYTES [relevant for MIPS only] - - When transferring memsize parameter to Linux, some versions - expect it to be in bytes, others in MB. - Define CONFIG_MEMSIZE_IN_BYTES to make it in bytes. - CONFIG_OF_LIBFDT New kernel versions are expecting firmware settings to be
@@ -585,11 +579,6 @@ The following options need to be configured: Support for generic parallel port TPM devices. Only one device per system is supported at this time. - CONFIG_TPM_TIS_BASE_ADDRESS - Base address where the generic TPM device is mapped - to. Contemporary x86 systems usually map it at - 0xfed40000. - CONFIG_TPM Define this to enable the TPM support library which provides functional interfaces to some TPM commands.
arch/arm/include/asm/arch-ls102xa/config.h +0 -1
@@ -70,7 +70,6 @@/* SATA */ #define AHCI_BASE_ADDR (CONFIG_SYS_IMMR + 0x02200000)#ifdef CONFIG_DDR_SPD -#define CONFIG_VERY_BIG_RAM #define CONFIG_MAX_MEM_MAPPED ((phys_size_t)2 << 30)#endif
arch/arm/mach-mvebu/include/mach/config.h +0 -9
@@ -30,13 +30,4 @@/* Needed for SPI NOR booting in SPL */ #define CONFIG_DM_SEQ_ALIAS 1 -/* -* I2C related stuff -*/ -#ifdef CONFIG_CMD_I2C -#ifndef CONFIG_SYS_I2C_SOFT -#define CONFIG_I2C_MVTWSI -#endif -#endif -#endif /* __MVEBU_CONFIG_H */
arch/powerpc/include/asm/config_mpc85xx.h +0 -1
@@ -133,7 +133,6 @@#define CFG_SYS_FM_MURAM_SIZE 0x60000#ifdef CONFIG_ARCH_B4860 -#define CONFIG_NUM_DSP_CPUS 6#define CFG_SYS_FSL_CLUSTER_CLOCKS { 1, 4, 4, 4 }#define CFG_SYS_NUM_FM1_DTSEC 6#define CFG_SYS_NUM_FM1_10GEC 2
arch/xtensa/include/asm/config.h +0 -1
@@ -14,7 +14,6 @@* restricting used physical memory to the first 128MB. */ #if XCHAL_HAVE_PTP_MMU -#define CONFIG_VERY_BIG_RAM #define CONFIG_MAX_MEM_MAPPED (128 << 20)#endif
board/Marvell/openrd/openrd.c +1 -1
@@ -140,7 +140,7 @@ void mv_phy_init(char *name)/* reset the phy */ miiphy_reset (name, devadr); -printf (PHY_NO " Initialized on %s\n" , name); +printf ("Initialized on %s\n" , name); }void reset_phy (void )
drivers/net/mvgbe.c +0 -4
@@ -37,10 +37,6 @@DECLARE_GLOBAL_DATA_PTR ; -#ifndef CONFIG_MVGBE_PORTS -# define CONFIG_MVGBE_PORTS {0, 0} -#endif -#define MV_PHY_ADR_REQUEST 0xee#define MVGBE_SMI_REG (((struct mvgbe_registers *)MVGBE0_BASE)->smi)#define MVGBE_PGADR_REG 22
drivers/net/mvgbe.h +0 -7
@@ -11,13 +11,6 @@#ifndef __MVGBE_H__#define __MVGBE_H__ -/* PHY_BASE_ADR is board specific and can be configured */ -#if defined (CONFIG_PHY_BASE_ADR ) -#define PHY_BASE_ADR CONFIG_PHY_BASE_ADR -#else -#define PHY_BASE_ADR 0x08/* default phy base addr */ -#endif -/* Constants */ #define INT_CAUSE_UNMASK_ALL 0x0007ffff#define INT_CAUSE_UNMASK_ALL_EXT 0x0011ffff
drivers/ram/mpc83xx_sdram.c +1 -6
@@ -118,12 +118,7 @@ int dram_init(void)phys_size_t get_effective_memsize (void ) { -if (!IS_ENABLED (CONFIG_VERY_BIG_RAM )) -return gd->ram_size; - -/* Limit stack to what we can reasonable map */ -return ((gd->ram_size >CONFIG_MAX_MEM_MAPPED ) ? -CONFIG_MAX_MEM_MAPPED : gd->ram_size); +return gd->ram_size; }/**
include/configs/MPC837XERDB.h +3 -5
@@ -195,12 +195,10 @@* Environment Configuration */ -#define CONFIG_NETDEV "eth1" - -#define CONFIG_FDTFILE "mpc8379_rdb.dtb" +#define FDTFILE "mpc8379_rdb.dtb"#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=" CONFIG_NETDEV "\0" \ + "netdev=eth1\0" \ "uboot=" CONFIG_UBOOTPATH "\0" \ "tftpflash=tftp $loadaddr $uboot;" \ "protect off " __stringify(CONFIG_TEXT_BASE) \
@@ -214,7 +212,7 @@ "cmp.b $loadaddr " __stringify(CONFIG_TEXT_BASE) \" $filesize\0" \"fdtaddr=780000\0" \ -"fdtfile=" CONFIG_FDTFILE "\0" \ +"fdtfile=" FDTFILE "\0" \"ramdiskaddr=1000000\0" \"ramdiskfile=rootfs.ext2.gz.uboot\0" \"console=ttyS0\0" \
include/configs/P1010RDB.h +0 -1
@@ -24,7 +24,6 @@#ifdef CONFIG_SPIFLASH #ifdef CONFIG_NXP_ESBC -#define CONFIG_RAMBOOT_SPIFLASH #define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc#else #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (512 << 10)
include/configs/P2041RDB.h +2 -7
@@ -12,7 +12,6 @@#define __CONFIG_H#ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc#endif
@@ -46,10 +45,9 @@/* * Config the L3 Cache as L3 SRAM */ -#define CFG_SYS_INIT_L3_ADDR CONFIG_RAMBOOT_TEXT_BASE +#define CFG_SYS_INIT_L3_ADDR CONFIG_TEXT_BASE#ifdef CONFIG_PHYS_64BIT -#define CFG_SYS_INIT_L3_ADDR_PHYS (0xf00000000ull | \ - CONFIG_RAMBOOT_TEXT_BASE) +#define CFG_SYS_INIT_L3_ADDR_PHYS (0xf00000000ull | CONFIG_TEXT_BASE)#else #define CFG_SYS_INIT_L3_ADDR_PHYS CFG_SYS_INIT_L3_ADDR#endif
@@ -62,7 +60,6 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
@@ -88,7 +85,6 @@#define CFG_SYS_FLASH_BASE_PHYS CFG_SYS_FLASH_BASE#endif -#define CONFIG_FSL_CPLD #define CPLD_BASE 0xffdf0000/* CPLD registers */ #ifdef CONFIG_PHYS_64BIT #define CPLD_BASE_PHYS 0xfffdf0000ull
@@ -131,7 +127,6 @@#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS + 0x8000000}/* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xffd00000/* Initial L1 address */ #ifdef CONFIG_PHYS_64BIT #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
include/configs/SBx81LIFKW.h +0 -9
@@ -37,14 +37,5 @@/* size in bytes reserved for initial data */ #include <asm/arch/config.h> -/* There is no PHY directly connected so don't ask it for link status */ - -/* -* Ethernet Driver configuration -*/ -#ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0}/* enable a single port */ -#define CONFIG_PHY_BASE_ADR 0x01 -#endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_SBX81LIFKW_H */
include/configs/SBx81LIFXCAT.h +0 -9
@@ -42,14 +42,5 @@/* size in bytes reserved for initial data */ #include <asm/arch/config.h> -/* There is no PHY directly connected so don't ask it for link status */ - -/* -* Ethernet Driver configuration -*/ -#ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0}/* enable a single port */ -#define CONFIG_PHY_BASE_ADR 0x01 -#endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_SBX81LIFXCAT_H */
include/configs/T102xRDB.h +0 -2
@@ -112,7 +112,6 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE#if defined(CONFIG_TARGET_T1024RDB )
@@ -269,7 +268,6 @@#endif /* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000/* Initial L1 address */ #ifdef CONFIG_PHYS_64BIT #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
include/configs/T104xRDB.h +0 -4
@@ -86,7 +86,6 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
@@ -247,7 +246,6 @@#endif /* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000/* Initial L1 address */ #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
@@ -285,8 +283,6 @@*/ #define CFG_SYS_I2C_RTC_ADDR 0x68 -/*DVI encoder*/ -#define CONFIG_HDMI_ENCODER_I2C_ADDR 0x75#endif /*
include/configs/T208xQDS.h +0 -2
@@ -78,7 +78,6 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE#define CFG_SYS_SDRAM_SIZE 2048/* for fixed parameter use */
@@ -245,7 +244,6 @@#endif /* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000/* Initial L1 address */ #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
include/configs/T208xRDB.h +0 -2
@@ -78,7 +78,6 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE#define CFG_SYS_SDRAM_SIZE 2048/* for fixed parameter use */
@@ -210,7 +209,6 @@#endif /* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000/* Initial L1 address */ #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
include/configs/T4240RDB.h +0 -3
@@ -16,7 +16,6 @@#ifdef CONFIG_RAMBOOT_PBL #ifndef CONFIG_SDCARD -#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc#else #define RESET_VECTOR_OFFSET 0x27FFC
@@ -60,7 +59,6 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
@@ -71,7 +69,6 @@#define CFG_SYS_FLASH_BASE_PHYS (0xf00000000ull | CFG_SYS_FLASH_BASE)/* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000/* Initial L1 address */ #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
include/configs/alt.h +0 -3
@@ -20,9 +20,6 @@#define RCAR_GEN2_SDRAM_SIZE (1024u * 1024 * 1024)#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024) -/* FLASH */ -#define CONFIG_SPI_FLASH_QUAD -/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0x1
include/configs/ax25-ae350.h +0 -3
@@ -49,9 +49,6 @@*/ #define CFG_SYS_FLASH_BANKS_SIZES {0x4000000} -/* max number of sectors on one chip */ -#define CONFIG_FLASH_SECTOR_SIZE (0x10000*2) -/* environments */ /* SPI FLASH */
include/configs/beaver.h +0 -4
@@ -20,10 +20,6 @@#define CONFIG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -/* SPI */ -#define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/blanche.h +1 -3
@@ -22,9 +22,7 @@#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)/* FLASH */ -#if !defined(CONFIG_MTD_NOR_FLASH ) -#define CONFIG_SH_QSPI_BASE 0xE6B10000 -#else +#if defined(CONFIG_MTD_NOR_FLASH )#define CFG_SYS_FLASH_BASE 0x00000000#define CFG_SYS_FLASH_SIZE 0x04000000/* 64 MB */ #define CFG_SYS_FLASH_BANKS_LIST { (CFG_SYS_FLASH_BASE) }
include/configs/cardhu.h +0 -4
@@ -24,10 +24,6 @@#define CONFIG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -/* SPI */ -#define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/cei-tk1-som.h +0 -3
@@ -22,9 +22,6 @@#define CONFIG_TEGRA_ENABLE_UARTD #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/colibri_vf.h +0 -4
@@ -14,10 +14,6 @@#include <asm/arch/imx-regs.h> #include <linux/sizes.h> -/* NAND support */ - -#define CONFIG_FDTADDR 0x84000000 -#define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "fdt_addr_r=0x82000000\0" \
include/configs/dalmore.h +0 -3
@@ -19,9 +19,6 @@/* Environment in eMMC, at the end of 2nd "boot sector" */ -/* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/dns325.h +0 -7
@@ -16,13 +16,6 @@/* Remove or override few declarations from mv-common.h */ -/* -* Ethernet Driver configuration -*/ -#ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -#endif -/* * Enable GPI0 support */
include/configs/dockstar.h +0 -6
@@ -28,10 +28,4 @@"initrd=/boot/uInitrd\0" \ "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0" -/* -* Ethernet Driver configuration - */ -#define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 -#endif /* _CONFIG_DOCKSTAR_H */
include/configs/dra7xx_evm.h +0 -1
@@ -13,7 +13,6 @@#include <environment/ti/dfu.h> -#define CONFIG_VERY_BIG_RAM #define CONFIG_MAX_MEM_MAPPED 0x80000000#ifndef CONFIG_QSPI_BOOT
include/configs/dreamplug.h +0 -6
@@ -24,10 +24,4 @@"x_bootargs=console=ttyS0,115200\0" \ "x_bootargs_root=root=/dev/sda2 rootdelay=10\0" -/* -* Ethernet Driver configuration - */ -#define CONFIG_MVGBE_PORTS {1, 1}/* enable both ports */ -#define CONFIG_PHY_BASE_ADR 0 -#endif /* _CONFIG_DREAMPLUG_H */
include/configs/ds109.h +0 -8
@@ -35,12 +35,4 @@"ipaddr=192.168.1.5\0" \ "usb0Mode=host\0" -/* -* Ethernet Driver configuration - */ -#ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0}/* enable one port */ -#define CONFIG_PHY_BASE_ADR 8 -#endif /* CONFIG_CMD_NET */ -#endif /* _CONFIG_DS109_H */
include/configs/eb_cpu5282.h +0 -8
@@ -144,13 +144,5 @@#define CFG_SYS_DDRUA 0x05#define CFG_SYS_PJPAR 0xFF -/*----------------------------------------------------------------------- -* I2C -*/ - -#ifdef CONFIG_CMD_DATE -#define CONFIG_I2C_RTC_ADDR 0x68 -#endif -#endif /* _CONFIG_M5282EVB_H */ /*---------------------------------------------------------------------*/
include/configs/efi-x86_app.h +0 -2
@@ -8,8 +8,6 @@#include <configs/x86-common.h> -#undef CONFIG_TPM_TIS_BASE_ADDRESS -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=vidconsole\0" \ "stderr=vidconsole\0"
include/configs/embestmx6boards.h +3 -3
@@ -35,11 +35,11 @@#if defined(CONFIG_ENV_IS_IN_MMC )/* RiOTboard */ -#define CONFIG_FDTFILE "imx6dl-riotboard.dtb" +#define FDTFILE "imx6dl-riotboard.dtb"#define CFG_SYS_FSL_USDHC_NUM 3#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH )/* MarSBoard */ -#define CONFIG_FDTFILE "imx6q-marsboard.dtb" +#define FDTFILE "imx6q-marsboard.dtb"#define CFG_SYS_FSL_USDHC_NUM 2#endif
@@ -79,7 +79,7 @@#define CONFIG_EXTRA_ENV_SETTINGS \ CONSOLE_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ - "fdtfile=" CONFIG_FDTFILE "\0" \ + "fdtfile=" FDTFILE "\0" \ "finduuid=part uuid mmc 0:1 uuid\0" \ BOOTENV
include/configs/ethernut5.h +0 -1
@@ -49,7 +49,6 @@/* Ethernet */ #define CONFIG_PHY_ID 0 -#define CONFIG_MACB_SEARCH_PHY /* MMC */ #ifdef CONFIG_CMD_MMC
include/configs/exynos5-common.h +0 -2
@@ -27,8 +27,6 @@/* MMC SPL */ #define COPY_BL2_FNPTR_ADDR 0x02020030 -#define CONFIG_RD_LVL -#define PHYS_SDRAM_1 CFG_SYS_SDRAM_BASE#define PHYS_SDRAM_1_SIZE SDRAM_BANK_SIZE#define PHYS_SDRAM_2 (CFG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
include/configs/exynos5420-common.h +0 -2
@@ -8,8 +8,6 @@#ifndef __CONFIG_EXYNOS5420_H#define __CONFIG_EXYNOS5420_H -#define CONFIG_VAR_SIZE_SPL -#define CONFIG_IRAM_TOP 0x02074000#define CONFIG_PHY_IRAM_BASE 0x02020000
include/configs/exynos7420-common.h +0 -4
@@ -15,10 +15,6 @@/* select serial console configuration */ -/* IRAM Layout */ -#define CONFIG_IRAM_BASE 0x02100000 -#define CONFIG_IRAM_SIZE 0x58000 -#define CONFIG_IRAM_END (CONFIG_IRAM_BASE + CONFIG_IRAM_SIZE)#define CPU_RELEASE_ADDR secondary_boot_addr/* select serial console configuration */
include/configs/goflexhome.h +0 -6
@@ -36,10 +36,4 @@"kernel=/boot/uImage\0" \ "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0" -/* -* Ethernet Driver configuration - */ -#define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 -#endif /* _CONFIG_GOFLEXHOME_H */
include/configs/guruplug.h +0 -8
@@ -30,12 +30,4 @@"fdt=/boot/guruplug-server-plus.dtb\0" \ "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0" -/* -* Ethernet Driver configuration - */ -#ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 1}/* enable both ports */ -#define CONFIG_PHY_BASE_ADR 0 -#endif /* CONFIG_CMD_NET */ -#endif /* _CONFIG_GURUPLUG_H */
include/configs/ib62x0.h +0 -8
@@ -24,14 +24,6 @@"fdt=/boot/ib62x0.dtb\0" \"bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0" -/* -* Ethernet driver configuration - */ -#ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 -#endif /* CONFIG_CMD_NET */ -/* * SATA driver configuration */
include/configs/iconnect.h +0 -10
@@ -16,14 +16,4 @@"kernel=/boot/uImage\0" \ "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0" -/* -* Ethernet driver configuration -* -* This board has PCIe Wifi card, so allow Ethernet to be disabled - */ -#ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 11 -#endif /* CONFIG_CMD_NET */ -#endif /* _CONFIG_ICONNECT_H */
include/configs/jetson-tk1.h +0 -5
@@ -18,11 +18,6 @@#define CONFIG_TEGRA_ENABLE_UARTD #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* Environment in eMMC, at the end of 2nd "boot sector" */ - -/* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/k2e_evm.h +0 -1
@@ -39,6 +39,5 @@/* Network */ #define CONFIG_KSNET_NETCP_V1_5 #define CONFIG_KSNET_CPSW_NUM_PORTS 9 -#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE #endif /* __CONFIG_K2E_EVM_H */
include/configs/k2g_evm.h +0 -1
@@ -53,7 +53,6 @@/* Network */ #define CONFIG_KSNET_NETCP_V1_5 #define CONFIG_KSNET_CPSW_NUM_PORTS 2 -#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE #define PHY_ANEG_TIMEOUT 10000/* PHY needs longer aneg time */ #define SPI_MTD_PARTS KEYSTONE_SPI1_MTD_PARTS
include/configs/k2l_evm.h +0 -1
@@ -39,6 +39,5 @@/* Network */ #define CONFIG_KSNET_NETCP_V1_5 #define CONFIG_KSNET_CPSW_NUM_PORTS 5 -#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE #endif /* __CONFIG_K2L_EVM_H */
include/configs/kmcent2.h +0 -1
@@ -160,7 +160,6 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/kontron_sl28.h +0 -1
@@ -18,7 +18,6 @@/* DDR */ #define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/lacie_kw.h +0 -7
@@ -14,13 +14,6 @@* Enable platform initialisation via misc_init_r() function */ -/* -* Ethernet Driver configuration -*/ -#ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -#endif -/* * Enable GPI0 support */
include/configs/legoev3.h +0 -1
@@ -48,7 +48,6 @@* Linux Information */ #define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100) -#define CONFIG_SETUP_INITRD_TAG #define CONFIG_EXTRA_ENV_SETTINGS \ "bootenvfile=uEnv.txt\0" \ "fdtfile=da850-lego-ev3.dtb\0" \
include/configs/ls1028a_common.h +0 -1
@@ -12,7 +12,6 @@/* Link Definitions */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/ls1043a_common.h +0 -1
@@ -31,7 +31,6 @@/* Link Definitions */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/ls1043aqds.h +0 -1
@@ -107,7 +107,6 @@#define CFG_SYS_NAND_FTIM3 0x0#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE #endif #ifdef CONFIG_NAND_BOOT
include/configs/ls1043ardb.h +0 -1
@@ -82,7 +82,6 @@#define CFG_SYS_NAND_FTIM3 0x0#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE #ifdef CONFIG_NAND_BOOT #define CFG_SYS_NAND_U_BOOT_SIZE (1024 << 10)
include/configs/ls1046a_common.h +0 -1
@@ -31,7 +31,6 @@/* Link Definitions */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/ls1046afrwy.h +0 -1
@@ -45,7 +45,6 @@#define CFG_SYS_NAND_FTIM3 0x0#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE /* IFC Timing Params */ #define CFG_SYS_CSPR0_EXT CFG_SYS_NAND_CSPR_EXT
include/configs/ls1046aqds.h +0 -1
@@ -123,7 +123,6 @@#define CFG_SYS_NAND_FTIM3 0x0#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE #endif #ifdef CONFIG_NAND_BOOT
include/configs/ls1046ardb.h +0 -1
@@ -50,7 +50,6 @@#define CFG_SYS_NAND_FTIM3 0x0#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE /* * CPLD
include/configs/ls1088a_common.h +0 -1
@@ -29,7 +29,6 @@/* Link Definitions */ #define CFG_SYS_FSL_QSPI_BASE 0x20000000 -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/ls1088aqds.h +0 -1
@@ -97,7 +97,6 @@#define CFG_SYS_NAND_FTIM3 0x0#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE #define CFG_SYS_I2C_FPGA_ADDR 0x66#define QIXIS_LBMAP_SWITCH 6
include/configs/ls1088ardb.h +0 -1
@@ -81,7 +81,6 @@#define CFG_SYS_NAND_FTIM3 0x0#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE #define CFG_SYS_I2C_FPGA_ADDR 0x66#define QIXIS_BRDCFG4_OFFSET 0x54
include/configs/ls2080a_common.h +0 -1
@@ -16,7 +16,6 @@/* Link Definitions */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/ls2080aqds.h +0 -1
@@ -98,7 +98,6 @@#define CFG_SYS_NAND_FTIM3 0x0#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE #define QIXIS_LBMAP_SWITCH 0x06#define QIXIS_LBMAP_MASK 0x0f
include/configs/ls2080ardb.h +0 -1
@@ -95,7 +95,6 @@#define CFG_SYS_NAND_FTIM3 0x0#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE #define QIXIS_LBMAP_SWITCH 0x06#define QIXIS_LBMAP_MASK 0x0f
include/configs/lx2160a_common.h +0 -1
@@ -13,7 +13,6 @@#define CFG_SYS_FLASH_BASE 0x20000000/* DDR */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0#define CFG_SYS_DDR_BLOCK2_BASE 0x2080000000ULL
include/configs/malta.h +0 -2
@@ -11,8 +11,6 @@*/ #define CONFIG_MALTA -#define CONFIG_MEMSIZE_IN_BYTES -/* * CPU Configuration */
include/configs/mt7621.h +0 -1
@@ -10,7 +10,6 @@#define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_VERY_BIG_RAM #define CONFIG_MAX_MEM_MAPPED 0x1c000000#define CFG_SYS_INIT_SP_OFFSET 0x800000
include/configs/mt7629.h +1 -4
@@ -15,10 +15,7 @@/* Environment */ -/* Defines for SPL */ - -#define CONFIG_SPI_ADDR 0x30000000 -#define CFG_SYS_UBOOT_BASE (CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO) +#define CFG_SYS_UBOOT_BASE (0x30000000 + CONFIG_SPL_PAD_TO)/* SPL -> Uboot */
include/configs/mxs.h +0 -5
@@ -86,9 +86,4 @@#define CFG_SYS_NAND_BASE 0x60000000#endif -/* SPI */ -#ifdef CONFIG_CMD_SPI -#define CONFIG_SPI_HALF_DUPLEX -#endif -#endif /* __CONFIGS_MXS_H__ */
include/configs/nas220.h +0 -12
@@ -39,16 +39,4 @@"bootargs=console=ttyS0,115200\0" \ "autostart=no\0" -/* -* Ethernet Driver configuration - */ -#ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 8 -#endif /* CONFIG_CMD_NET */ - -/* -* EFI partition -*/ -#endif /* _CONFIG_NAS220_H */
include/configs/nsa310s.h +0 -4
@@ -46,8 +46,4 @@#endif /* CONFIG_SPL_BUILD */ -/* Ethernet driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 1 -#endif /* _CONFIG_NSA310S_H */
include/configs/nyan-big.h +0 -3
@@ -18,9 +18,6 @@#define CONFIG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -/* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/openrd.h +0 -22
@@ -33,26 +33,4 @@"x_bootcmd_usb=usb start\0" \ "x_bootargs_root=root=ubi0:rootfs rootfstype=ubifs\0" -/* -* Ethernet Driver configuration - */ -#ifdef CONFIG_CMD_NET -# ifdef CONFIG_BOARD_IS_OPENRD_BASE -# define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -# else -# define CONFIG_MVGBE_PORTS {1, 1}/* enable both ports */ -# endif -# ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE -# define CONFIG_PHY_BASE_ADR 0x0 -# define PHY_NO "88E1121" -# else -# define CONFIG_PHY_BASE_ADR 0x8 -# define PHY_NO "88E1116" -# endif -#endif /* CONFIG_CMD_NET */ - -/* -* SATA Driver configuration -*/ -#endif /* _CONFIG_OPENRD_BASE_H */
include/configs/origen.h +0 -6
@@ -38,10 +38,4 @@"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ "source ${loadaddr}\0" -/* MIU (Memory Interleaving Unit) */ -#define CONFIG_MIU_2BIT_21_7_INTERLEAVED - -#define RESERVE_BLOCK_SIZE (512) -#define BL1_SIZE (16 << 10)/*16 K reserved for BL1*/ -#endif /* __CONFIG_H */
include/configs/p2371-0000.h +0 -3
@@ -19,9 +19,6 @@/* Environment in eMMC, at the end of 2nd "boot sector" */ -/* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-post.h" #endif /* _P2371_0000_H */
include/configs/p2371-2180.h +0 -3
@@ -19,9 +19,6 @@/* Environment in eMMC, at the end of 2nd "boot sector" */ -/* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-post.h" #endif /* _P2371_2180_H */
include/configs/p2571.h +0 -3
@@ -19,9 +19,6 @@/* Environment in eMMC, at the end of 2nd "boot sector" */ -/* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-post.h" #endif /* _P2571_H */
include/configs/p3450-0000.h +0 -3
@@ -23,9 +23,6 @@ func(PXE, pxe, na) \ func(DHCP, dhcp, na) -/* Environment at end of QSPI, in the VER partition */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#define BOARD_EXTRA_ENV_SETTINGS \ "preboot=if test -e mmc 1:1 /u-boot-preboot.scr; then " \ "load mmc 1:1 ${scriptaddr} /u-boot-preboot.scr; " \
include/configs/pm9263.h +0 -5
@@ -159,11 +159,6 @@/* PSRAM */ #define PHYS_PSRAM 0x70000000#define PHYS_PSRAM_SIZE 0x00400000/* 4MB */ -/* Slave EBI1, PSRAM connected */ -#define CONFIG_PSRAM_SCFG (AT91_MATRIX_SCFG_ARBT_FIXED_PRIORITY | \ - AT91_MATRIX_SCFG_FIXED_DEFMSTR(5) | \ - AT91_MATRIX_SCFG_DEFMSTR_TYPE_FIXED | \ - AT91_MATRIX_SCFG_SLOT_CYCLE(255))/* USB */ #define CFG_SYS_USB_OHCI_REGS_BASE 0x00a00000/* AT91SAM9263_UHP_BASE */
include/configs/pogo_e02.h +0 -6
@@ -23,10 +23,4 @@"bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \ "ext2load usb 0:1 0x01100000 /uInitrd\0" -/* -* Ethernet Driver configuration - */ -#define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 -#endif /* _CONFIG_POGO_E02_H */
include/configs/pogo_v4.h +0 -6
@@ -69,10 +69,4 @@ BOOTENV#endif /* CONFIG_SPL_BUILD */ -/* -* Ethernet Driver configuration -*/ -#define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 -#endif /* _CONFIG_POGO_V4_H */
include/configs/porter.h +0 -3
@@ -21,9 +21,6 @@#define RCAR_GEN2_SDRAM_SIZE (2048u * 1024 * 1024)#define RCAR_GEN2_UBOOT_SDRAM_SIZE (1024u * 1024 * 1024) -/* FLASH */ -#define CONFIG_SPI_FLASH_QUAD -/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0x1
include/configs/qemu-ppce500.h +0 -1
@@ -29,7 +29,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/rcar-gen3-common.h +0 -1
@@ -28,7 +28,6 @@#define DRAM_RSV_SIZE 0x08000000#define CFG_SYS_SDRAM_BASE (0x40000000 + DRAM_RSV_SIZE)#define CFG_SYS_SDRAM_SIZE (0x80000000u - DRAM_RSV_SIZE) -#define CONFIG_VERY_BIG_RAM #define CONFIG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE)/* ENV setting */
include/configs/rk3399_common.h +0 -10
@@ -10,16 +10,6 @@#define CONFIG_IRAM_BASE 0xff8c0000 -#if defined(CONFIG_SPL_BUILD ) && defined(CONFIG_TPL_BOOTROM_SUPPORT ) -#else -/* BSS setup */ -#endif - -/* MMC/SD IP block */ -#define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000 - -/* RAW SD card / eMMC locations. */ -/* FAT sd card locations. */ #define CFG_SYS_SDRAM_BASE 0#define SDRAM_MAX_SIZE 0xf8000000
include/configs/sheevaplug.h +0 -6
@@ -21,10 +21,4 @@"x_bootcmd_usb=usb start\0" \ "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0" -/* -* Ethernet Driver configuration - */ -#define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 -#endif /* _CONFIG_SHEEVAPLUG_H */
include/configs/silk.h +0 -3
@@ -21,9 +21,6 @@#define RCAR_GEN2_SDRAM_SIZE (1024u * 1024 * 1024)#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024) -/* FLASH */ -#define CONFIG_SPI_FLASH_QUAD -/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0x1
include/configs/smdk5420.h +0 -2
@@ -12,8 +12,6 @@#include <configs/exynos5-dt-common.h> #include <configs/exynos5-common.h> -#define CONFIG_SMDK5420 /* which is in a SMDK5420 */ -#define CFG_SYS_SDRAM_BASE 0x20000000/* DRAM Memory Banks */
include/configs/smdkv310.h +0 -3
@@ -34,9 +34,6 @@/* FLASH and environment organization */ -#define RESERVE_BLOCK_SIZE (512) -#define BL1_SIZE (16 << 10)/*16 K reserved for BL1*/ -/* Ethernet Controllor Driver */ #ifdef CONFIG_CMD_NET #define CONFIG_ENV_SROM_BANK 1
include/configs/socfpga_sr1500.h +0 -6
@@ -11,15 +11,9 @@#define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SR1500 */ /* Ethernet on SoC (EMAC) */ -#define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII/* The PHY is autodetected, so no MII PHY address is needed here */ #define PHY_ANEG_TIMEOUT 8000 -/* Enable SPI NOR flash reset, needed for SPI booting */ -#define CONFIG_SPI_N25Q256A_RESET - -/* Environment setting for SPI flash */ -/* The rest of the configuration is shared */ #include <configs/socfpga_common.h>
include/configs/socrates.h +0 -4
@@ -16,9 +16,6 @@#ifndef __CONFIG_H#define __CONFIG_H -/* High Level Configuration Options */ -#define CONFIG_SOCRATES 1 -/* * Only possible on E500 Version 2 or newer cores. */
@@ -55,7 +52,6 @@#define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE -#define CONFIG_VERY_BIG_RAM /* I2C addresses of SPD EEPROMs */ #define SPD_EEPROM_ADDRESS 0x50/* CTLR 0 DIMM 0 */
include/configs/stout.h +0 -3
@@ -25,9 +25,6 @@/* SCIF */ #define CONFIG_SCIF_A -/* SPI */ -#define CONFIG_SPI_FLASH_QUAD -/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0x1
include/configs/synquacer.h +0 -1
@@ -14,7 +14,6 @@#define CFG_SYS_SDRAM_BASE (0x80000000)/* Start address of DDR3 */ #define PHYS_SDRAM_SIZE (0x7c000000)/* Default size (2GB - Secure memory) */ -#define CONFIG_VERY_BIG_RAM /* SynQuacer supports up to 64GB */ #define CONFIG_MAX_MEM_MAPPED PHYS_SDRAM_SIZE#define SQ_DRAMINFO_BASE (0x2e00ffc0)/* DRAM info from TF-A */
include/configs/tec-ng.h +0 -6
@@ -16,12 +16,6 @@#define CONFIG_TEGRA_ENABLE_UARTD #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* Environment in eMMC, at the end of 2nd "boot sector" */ - -/* SPI */ -#define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/venice2.h +0 -3
@@ -20,9 +20,6 @@/* Environment in eMMC, at the end of 2nd "boot sector" */ -/* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/vinco.h +0 -3
@@ -39,9 +39,6 @@/* USB device */ -/* Ethernet Hardware */ -#define CONFIG_MACB_SEARCH_PHY -#ifdef CONFIG_SPI_BOOT /* bootstrap + u-boot + env + linux in serial flash */ /* Use our own mapping for the VInCo platform */
include/configs/x86-common.h +0 -16
@@ -10,22 +10,6 @@#ifndef __CONFIG_X86_COMMON_H#define __CONFIG_X86_COMMON_H -/* -* High Level Configuration Options -* (easy to change) -*/ - -/* Generic TPM interfaced through LPC bus */ -#define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000 - -/*----------------------------------------------------------------------- -* Serial Configuration -*/ - -/* -* Miscellaneous configurable options -*/ -/*----------------------------------------------------------------------- * CPU Features */
include/configs/xpress.h +2 -5
@@ -34,9 +34,6 @@#define CONFIG_FEC_ENET_DEV 0#define CONFIG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_UBOOT_SECTOR_START 0x2 -#define CONFIG_UBOOT_SECTOR_COUNT 0x3fe -#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \
@@ -75,8 +72,8 @@"bootz; " \"fi;\0" \"uboot=ccv/u-boot.imx\0" \ - "uboot_start="__stringify(CONFIG_UBOOT_SECTOR_START)"\0" \ - "uboot_size="__stringify(CONFIG_UBOOT_SECTOR_COUNT)"\0" \ +"uboot_start=0x2\0" \ +"uboot_size=0x3fe\0" \"update_uboot=if tftp ${uboot}; then " \"if itest ${filesize} > 0; then " \"mmc dev 0 1;" \
Signature · 1 line
2.25.1
PATCH 22/41 Convert CONFIG_KSNET_NETCP_V1_0 et al to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_KSNET_NETCP_V1_0
CONFIG_KSNET_NETCP_V1_5
--- configs/k2hk_evm_defconfig | 1 + configs/k2hk_hs_evm_defconfig | 1 + drivers/net/ti/Kconfig | 13 +++++++++++++ include/configs/k2e_evm.h | 1 - include/configs/k2g_evm.h | 1 - include/configs/k2hk_evm.h | 1 - include/configs/k2l_evm.h | 1 - 7 files changed, 15 insertions(+), 4 deletions(-)
configs/k2hk_evm_defconfig +1 -0
@@ -87,6 +87,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MARVELL=y CONFIG_MII=y CONFIG_DRIVER_TI_KEYSTONE_NET=y +CONFIG_KSNET_NETCP_V1_0=y CONFIG_PHY=y CONFIG_NOP_PHY=y CONFIG_KEYSTONE_USB_PHY=y
configs/k2hk_hs_evm_defconfig +1 -0
@@ -62,6 +62,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MARVELL=y CONFIG_MII=y CONFIG_DRIVER_TI_KEYSTONE_NET=y +CONFIG_KSNET_NETCP_V1_0=y CONFIG_PHY=y CONFIG_NOP_PHY=y CONFIG_KEYSTONE_USB_PHY=y
drivers/net/ti/Kconfig +13 -0
@@ -25,6 +25,19 @@ config DRIVER_TI_KEYSTONE_NET help This driver supports the TI Keystone 2 Ethernet subsystem +choice + prompt "TI Keystone 2 Ethernet NETCP IP revision" + depends on DRIVER_TI_KEYSTONE_NET + default KSNET_NETCP_V1_5 + +config KSNET_NETCP_V1_0 + bool "NETCP version 1.0" + +config KSNET_NETCP_V1_5 + bool "NETCP version 1.5" + +endchoice + config TI_AM65_CPSW_NUSS bool "TI K3 AM65x MCU CPSW Nuss Ethernet controller driver" depends on ARCH_K3
include/configs/k2e_evm.h +0 -1
@@ -37,7 +37,6 @@#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS/* Network */ -#define CONFIG_KSNET_NETCP_V1_5 #define CONFIG_KSNET_CPSW_NUM_PORTS 9#endif /* __CONFIG_K2E_EVM_H */
include/configs/k2g_evm.h +0 -1
@@ -51,7 +51,6 @@"name_fs=arago-base-tisdk-image-k2g-evm.cpio\0" /* Network */ -#define CONFIG_KSNET_NETCP_V1_5 #define CONFIG_KSNET_CPSW_NUM_PORTS 2#define PHY_ANEG_TIMEOUT 10000/* PHY needs longer aneg time */
include/configs/k2hk_evm.h +0 -1
@@ -37,7 +37,6 @@#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS/* Network */ -#define CONFIG_KSNET_NETCP_V1_0 #define CONFIG_KSNET_CPSW_NUM_PORTS 5#endif /* __CONFIG_K2HK_EVM_H */
include/configs/k2l_evm.h +0 -1
@@ -37,7 +37,6 @@#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS/* Network */ -#define CONFIG_KSNET_NETCP_V1_5 #define CONFIG_KSNET_CPSW_NUM_PORTS 5#endif /* __CONFIG_K2L_EVM_H */
Signature · 1 line
2.25.1
PATCH 23/41 Convert CONFIG_L2_CACHE to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_L2_CACHE
--- arch/powerpc/cpu/mpc85xx/Kconfig | 3 +++ configs/MPC8548CDS_36BIT_defconfig | 1 + configs/MPC8548CDS_defconfig | 1 + configs/MPC8548CDS_legacy_defconfig | 1 + configs/P1010RDB-PA_36BIT_NAND_defconfig | 1 + configs/P1010RDB-PA_36BIT_NOR_defconfig | 1 + configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 1 + configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 1 + configs/P1010RDB-PA_NAND_defconfig | 1 + configs/P1010RDB-PA_NOR_defconfig | 1 + configs/P1010RDB-PA_SDCARD_defconfig | 1 + configs/P1010RDB-PA_SPIFLASH_defconfig | 1 + configs/P1010RDB-PB_36BIT_NAND_defconfig | 1 + configs/P1010RDB-PB_36BIT_NOR_defconfig | 1 + configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 1 + configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 1 + configs/P1010RDB-PB_NAND_defconfig | 1 + configs/P1010RDB-PB_NOR_defconfig | 1 + configs/P1010RDB-PB_SDCARD_defconfig | 1 + configs/P1010RDB-PB_SPIFLASH_defconfig | 1 + configs/P1020RDB-PC_36BIT_NAND_defconfig | 1 + configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 1 + configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 + configs/P1020RDB-PC_36BIT_defconfig | 1 + configs/P1020RDB-PC_NAND_defconfig | 1 + configs/P1020RDB-PC_SDCARD_defconfig | 1 + configs/P1020RDB-PC_SPIFLASH_defconfig | 1 + configs/P1020RDB-PC_defconfig | 1 + configs/P1020RDB-PD_NAND_defconfig | 1 + configs/P1020RDB-PD_SDCARD_defconfig | 1 + configs/P1020RDB-PD_SPIFLASH_defconfig | 1 + configs/P1020RDB-PD_defconfig | 1 + configs/P2020RDB-PC_36BIT_NAND_defconfig | 1 + configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 1 + configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 + configs/P2020RDB-PC_36BIT_defconfig | 1 + configs/P2020RDB-PC_NAND_defconfig | 1 + configs/P2020RDB-PC_SDCARD_defconfig | 1 + configs/P2020RDB-PC_SPIFLASH_defconfig | 1 + configs/P2020RDB-PC_defconfig | 1 + configs/socrates_defconfig | 1 + include/configs/MPC8548CDS.h | 5 ----- include/configs/P1010RDB.h | 5 ----- include/configs/p1_p2_rdb_pc.h | 5 ----- include/configs/socrates.h | 5 ----- 45 files changed, 43 insertions(+), 20 deletions(-)
arch/powerpc/cpu/mpc85xx/Kconfig +3 -0
@@ -1297,6 +1297,9 @@ config SYS_NUM_TLBCAMS Number of TLB CAM entries for Book-E chips. 64 for E500MC, 16 for other E500 SoCs. +config L2_CACHE + bool "Enable L2 cache support" + if HETROGENOUS_CLUSTERS config SYS_MAPLE
configs/MPC8548CDS_36BIT_defconfig +1 -0
@@ -13,6 +13,7 @@ CONFIG_SRIO1=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_MPC8548CDS=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_USE_UBOOTPATH=y CONFIG_UBOOTPATH="8548cds/u-boot.bin"
configs/MPC8548CDS_defconfig +1 -0
@@ -13,6 +13,7 @@ CONFIG_SRIO1=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_MPC8548CDS=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_USE_UBOOTPATH=y CONFIG_UBOOTPATH="8548cds/u-boot.bin"
configs/MPC8548CDS_legacy_defconfig +1 -0
@@ -13,6 +13,7 @@ CONFIG_SRIO1=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_MPC8548CDS=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_TARGET_MPC8548CDS_LEGACY=y CONFIG_USE_UBOOTPATH=y
configs/P1010RDB-PA_36BIT_NAND_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_TPL_MAX_SIZE=0x20000 CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1010RDB-PA_36BIT_NOR_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_USE_UBOOTPATH=y
configs/P1010RDB-PA_36BIT_SDCARD_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_SPL_SPI=y CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1010RDB-PA_NAND_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_TPL_MAX_SIZE=0x20000 CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1010RDB-PA_NOR_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_USE_UBOOTPATH=y
configs/P1010RDB-PA_SDCARD_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1010RDB-PA_SPIFLASH_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_SPL_SPI=y CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1010RDB-PB_36BIT_NAND_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_TPL_MAX_SIZE=0x20000 CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1010RDB-PB_36BIT_NOR_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_USE_UBOOTPATH=y
configs/P1010RDB-PB_36BIT_SDCARD_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_SPL_SPI=y CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1010RDB-PB_NAND_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_TPL_MAX_SIZE=0x20000 CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1010RDB-PB_NOR_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_USE_UBOOTPATH=y
configs/P1010RDB-PB_SDCARD_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1010RDB-PB_SPIFLASH_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_SPL_SPI=y CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1020RDB-PC_36BIT_NAND_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PC=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1020RDB-PC_36BIT_SDCARD_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PC=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PC=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1020RDB-PC_36BIT_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PC=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_USE_UBOOTPATH=y
configs/P1020RDB-PC_NAND_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PC=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1020RDB-PC_SDCARD_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PC=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1020RDB-PC_SPIFLASH_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PC=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1020RDB-PC_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PC=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_USE_UBOOTPATH=y
configs/P1020RDB-PD_NAND_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PD=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1020RDB-PD_SDCARD_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PD=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1020RDB-PD_SPIFLASH_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PD=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P1020RDB-PD_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PD=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_USE_UBOOTPATH=y
configs/P2020RDB-PC_36BIT_NAND_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P2020RDB=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P2020RDB-PC_36BIT_SDCARD_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P2020RDB=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P2020RDB=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P2020RDB-PC_36BIT_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P2020RDB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_USE_UBOOTPATH=y
configs/P2020RDB-PC_NAND_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P2020RDB=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P2020RDB-PC_SDCARD_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P2020RDB=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P2020RDB-PC_SPIFLASH_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P2020RDB=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
configs/P2020RDB-PC_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P2020RDB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_USE_UBOOTPATH=y
configs/socrates_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_SOCRATES=y +CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MONITOR_LEN=393216 CONFIG_FIT=y
include/configs/MPC8548CDS.h +0 -5
@@ -17,11 +17,6 @@#include <linux/stringify.h> #endif -/* -* These can be toggled for performance analysis, otherwise use default. -*/ -#define CONFIG_L2_CACHE /* toggle L2 cache */ -/* * Only possible on E500 Version 2 or newer cores. */
include/configs/P1010RDB.h +0 -5
@@ -95,11 +95,6 @@#endif #endif -/* -* These can be toggled for performance analysis, otherwise use default. -*/ -#define CONFIG_L2_CACHE /* toggle L2 cache */ -/* DDR Setup */ #define SPD_EEPROM_ADDRESS 0x52
include/configs/p1_p2_rdb_pc.h +0 -5
@@ -109,11 +109,6 @@#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc#endif -/* -* These can be toggled for performance analysis, otherwise use default. -*/ -#define CONFIG_L2_CACHE -#define CFG_SYS_CCSRBAR 0xffe00000#define CFG_SYS_CCSRBAR_PHYS_LOW CFG_SYS_CCSRBAR
include/configs/socrates.h +0 -5
@@ -34,11 +34,6 @@* in the README.mpc85xxads. */ -/* -* These can be toggled for performance analysis, otherwise use default. -*/ -#define CONFIG_L2_CACHE /* toggle L2 cache */ -#define CFG_SYS_INIT_DBCR DBCR_IDM/* Enable Debug Exceptions */ #undef CFG_SYS_DRAM_TEST/* memory test, takes time */
Signature · 1 line
2.25.1
PATCH 24/41 malta: Rename CONFIG_MALTA to CONFIG_TARGET_MALTA
In reply to Tom RiniFixup this last remnant of CONFIG_MALTA.
--- drivers/rtc/mc146818.c | 2 +- include/configs/malta.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/rtc/mc146818.c +1 -1
@@ -13,7 +13,7 @@#include <dm.h> #include <rtc.h> -#if defined(CONFIG_X86 ) || defined(CONFIG_MALTA ) +#if defined(CONFIG_X86 ) || defined(CONFIG_TARGET_MALTA )#include <asm/io.h> #define in8 (p) inb(p)#define out8 (p, v) outb(v, p)
include/configs/malta.h +0 -1
@@ -9,7 +9,6 @@/* * System configuration */ -#define CONFIG_MALTA /* * CPU Configuration
Signature · 1 line
2.25.1
PATCH 25/41 ddr: fsl: Remove CONFIG_MEM_INIT_VALUE
In reply to Tom RiniThe way all of the memory init code here works is that we pass 0xDEADBEEF around for the initial value (as it's a well known 'poison' value and so easily recognized in debuggers, etc). The only point of this CONFIG symbol was to pass in a different value for that purpose. Drop this symbol and cleanup the code slightly.
--- arch/powerpc/include/asm/fsl_dma.h | 2 +- drivers/ddr/fsl/ctrl_regs.c | 17 ++--------------- drivers/ddr/fsl/mpc85xx_ddr_gen1.c | 2 +- drivers/dma/fsl_dma.c | 4 ++-- include/configs/MPC8548CDS.h | 2 -- include/configs/P1010RDB.h | 2 -- include/configs/T102xRDB.h | 3 --- include/configs/T104xRDB.h | 3 --- include/configs/T208xQDS.h | 7 ------- include/configs/T208xRDB.h | 7 ------- include/configs/T4240RDB.h | 7 ------- include/configs/kontron_sl28.h | 3 --- include/configs/ls1021aqds.h | 4 ---- include/configs/ls1043aqds.h | 4 ---- include/configs/ls1043ardb.h | 6 ------ include/configs/ls1046aqds.h | 4 ---- include/configs/ls1046ardb.h | 2 -- include/configs/ls1088aqds.h | 1 - include/configs/ls1088ardb.h | 1 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/lx2160a_common.h | 1 - include/configs/socrates.h | 3 --- 23 files changed, 6 insertions(+), 81 deletions(-)
arch/powerpc/include/asm/fsl_dma.h +1 -1
@@ -117,7 +117,7 @@ typedef struct fsl_dma {void dma_init (void );int dmacpy (phys_addr_t dest,phys_addr_t src,phys_size_t n);#if (defined(CONFIG_DDR_ECC ) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER )) -void dma_meminit (uint val,uint size); +void dma_meminit (uint size);#endif #endif
drivers/ddr/fsl/ctrl_regs.c +2 -15
@@ -938,7 +938,7 @@ static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num,#if defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER )/* Use the DDR controller to auto initialize memory. */ d_init = popts->ecc_init_using_memctl; - ddr->ddr_data_init =CONFIG_MEM_INIT_VALUE ; + ddr->ddr_data_init =0xDEADBEEF ;debug ("DDR: ddr_data_init = 0x%08x\n" , ddr->ddr_data_init);#else /* Memory will be initialized via DMA, or not at all. */
@@ -1842,19 +1842,6 @@ static void set_ddr_sdram_mode(const unsigned int ctrl_num, }#endif -/* DDR SDRAM Data Initialization (DDR_DATA_INIT) */ -static void set_ddr_data_init (fsl_ddr_cfg_regs_t *ddr) -{ -unsigned int init_value;/* Initialization value */ - -#ifdef CONFIG_MEM_INIT_VALUE - init_value =CONFIG_MEM_INIT_VALUE ; -#else - init_value =0xDEADBEEF ; -#endif - ddr->ddr_data_init = init_value; -} -/* * DDR SDRAM Clock Control (DDR_SDRAM_CLK_CNTL) * The old controller on the 8540/60 doesn't have this register.
@@ -2537,7 +2524,7 @@ compute_fsl_memctl_config_regs(const unsigned int ctrl_num,set_ddr_sdram_rcw (ctrl_num, ddr, popts, common_dimm);set_ddr_sdram_interval (ctrl_num, ddr, popts, common_dimm); -set_ddr_data_init (ddr); + ddr->ddr_data_init =0xDEADBEEF ;set_ddr_sdram_clk_cntl (ddr, popts);set_ddr_init_addr (ddr);set_ddr_init_ext_addr (ddr);
drivers/ddr/fsl/mpc85xx_ddr_gen1.c +1 -1
@@ -73,7 +73,7 @@ ddr_enable_ecc(unsigned int dram_size)struct ccsr_ddr __iomem *ddr = (struct ccsr_ddr __iomem *)(CFG_SYS_FSL_DDR_ADDR ); -dma_meminit (CONFIG_MEM_INIT_VALUE , dram_size); +dma_meminit (dram_size);/* * Enable errors for ECC.
drivers/dma/fsl_dma.c +2 -2
@@ -133,7 +133,7 @@ int dmacpy(phys_addr_t dest, phys_addr_t src, phys_size_t count) {*/ #if ((!defined CONFIG_MPC83xx && defined(CONFIG_DDR_ECC ) && \ !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER ))) -void dma_meminit (uint val,uint size) +void dma_meminit (uint size) {uint *p =0 ;uint i =0 ;
@@ -142,7 +142,7 @@ void dma_meminit(uint val, uint size)if (((uint )p &0x1f ) ==0 )ppcDcbz ((ulong )p); - *p = (uint )CONFIG_MEM_INIT_VALUE ; + *p = (uint )0xDEADBEEF ;if (((uint )p &0x1c ) ==0x1c )ppcDcbf ((ulong )p);
include/configs/MPC8548CDS.h +0 -2
@@ -26,8 +26,6 @@/* DDR Setup */ -#define CONFIG_MEM_INIT_VALUE 0xDeadBeef -#define CFG_SYS_DDR_SDRAM_BASE 0x00000000/* DDR is system memory*/ #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/P1010RDB.h +0 -2
@@ -98,8 +98,6 @@/* DDR Setup */ #define SPD_EEPROM_ADDRESS 0x52 -#define CONFIG_MEM_INIT_VALUE 0xDeadBeef -#ifndef __ASSEMBLY__extern unsigned long get_sdram_size (void );#endif
include/configs/T102xRDB.h +0 -3
@@ -94,9 +94,6 @@* These can be toggled for performance analysis, otherwise use default. */ #define CFG_SYS_INIT_L2CSR0 L2CSR0_L2E -#ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#endif /* * Config the L3 Cache as L3 SRAM
include/configs/T104xRDB.h +0 -3
@@ -64,9 +64,6 @@* These can be toggled for performance analysis, otherwise use default. */ #define CFG_SYS_INIT_L2CSR0 L2CSR0_L2E -#ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#endif /* * Config the L3 Cache as L3 SRAM
include/configs/T208xQDS.h +0 -7
@@ -59,13 +59,6 @@#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc#endif -/* -* These can be toggled for performance analysis, otherwise use default. -*/ -#ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#endif -/* * Config the L3 Cache as L3 SRAM */
include/configs/T208xRDB.h +0 -7
@@ -59,13 +59,6 @@#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc#endif -/* -* These can be toggled for performance analysis, otherwise use default. -*/ -#ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#endif -/* * Config the L3 Cache as L3 SRAM */
include/configs/T4240RDB.h +0 -7
@@ -40,13 +40,6 @@#define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS -/* -* These can be toggled for performance analysis, otherwise use default. -*/ -#ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#endif -/* * Config the L3 Cache as L3 SRAM */
include/configs/kontron_sl28.h +0 -3
@@ -15,9 +15,6 @@#undef CFG_SYS_MEM_RESERVE_SECURE#endif -/* DDR */ -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#define CFG_SYS_DDR_SDRAM_BASE 0x80000000#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/ls1021aqds.h +0 -4
@@ -22,10 +22,6 @@#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE -#ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#endif -/* * IFC Definitions */
include/configs/ls1043aqds.h +0 -4
@@ -12,10 +12,6 @@#define SPD_EEPROM_ADDRESS 0x51 -#ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#endif -#ifdef CONFIG_SYS_DPAA_FMAN #define RGMII_PHY1_ADDR 0x1#define RGMII_PHY2_ADDR 0x2
include/configs/ls1043ardb.h +0 -6
@@ -9,12 +9,6 @@#include "ls1043a_common.h" -/* Physical Memory Map */ - -#ifndef CONFIG_SPL -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#endif -/* * NOR Flash Definitions */
include/configs/ls1046aqds.h +0 -4
@@ -12,10 +12,6 @@#define SPD_EEPROM_ADDRESS 0x51 -#ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#endif -#ifdef CONFIG_SYS_DPAA_FMAN #define RGMII_PHY1_ADDR 0x1#define RGMII_PHY2_ADDR 0x2
include/configs/ls1046ardb.h +0 -2
@@ -13,8 +13,6 @@#define SPD_EEPROM_ADDRESS 0x51 -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#if defined(CONFIG_QSPI_BOOT )#define CFG_SYS_UBOOT_BASE 0x40100000#endif
include/configs/ls1088aqds.h +0 -1
@@ -14,7 +14,6 @@#define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4) -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef#define SPD_EEPROM_ADDRESS 0x51
include/configs/ls1088ardb.h +0 -1
@@ -15,7 +15,6 @@#define COUNTER_FREQUENCY_REAL 25000000/* 25MHz */ -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef#define SPD_EEPROM_ADDRESS 0x51
include/configs/ls2080aqds.h +0 -1
@@ -16,7 +16,6 @@#define CFG_SYS_I2C_FPGA_ADDR 0x66#define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4) -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef#define SPD_EEPROM_ADDRESS1 0x51#define SPD_EEPROM_ADDRESS2 0x52#define SPD_EEPROM_ADDRESS3 0x53
include/configs/ls2080ardb.h +0 -1
@@ -21,7 +21,6 @@#define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4) -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef#define SPD_EEPROM_ADDRESS1 0x51#define SPD_EEPROM_ADDRESS2 0x52#define SPD_EEPROM_ADDRESS3 0x53
include/configs/lx2160a_common.h +0 -1
@@ -18,7 +18,6 @@#define CFG_SYS_DDR_BLOCK2_BASE 0x2080000000ULL#define CFG_SYS_SDRAM_SIZE 0x200000000UL#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef#define SPD_EEPROM_ADDRESS1 0x51#define SPD_EEPROM_ADDRESS2 0x52#define SPD_EEPROM_ADDRESS3 0x53
include/configs/socrates.h +0 -3
@@ -42,9 +42,6 @@#define CFG_SYS_CCSRBAR_PHYS_LOW CFG_SYS_CCSRBAR/* DDR Setup */ - -#define CONFIG_MEM_INIT_VALUE 0xDeadBeef -#define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
Signature · 1 line
2.25.1
PATCH 26/41 Convert CONFIG_MONITOR_IS_IN_RAM to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_MONITOR_IS_IN_RAM
As part of this, reword some of the documentation slightly to reflect that this is in Kconfig and not a define now.
--- arch/Kconfig | 4 ++++ board/cobra5272/README | 27 +++++++++------------------ configs/10m50_defconfig | 1 + configs/3c120_defconfig | 1 + doc/arch/m68k.rst | 4 ++-- include/configs/10m50_devboard.h | 1 - include/configs/3c120_devboard.h | 1 - include/configs/M5249EVB.h | 2 -- include/configs/M5272C3.h | 2 -- include/configs/M5282EVB.h | 2 -- include/configs/astro_mcf5373l.h | 25 ------------------------- include/configs/cobra5272.h | 21 --------------------- include/configs/eb_cpu5282.h | 2 -- 13 files changed, 17 insertions(+), 76 deletions(-)
arch/Kconfig +4 -0
@@ -380,6 +380,10 @@ config SYS_IMMR Address for the Internal Memory-Mapped Registers (IMMR) window used to configure the features of many Freescale / NXP SoCs. +config MONITOR_IS_IN_RAM + bool "U-Boot is loaded in to RAM by a pre-loader" + depends on M68K || NIOS2 + config SKIP_LOWLEVEL_INIT bool "Skip the calls to certain low level initialization functions" depends on ARM || MIPS || RISCV
board/cobra5272/README +9 -18
@@ -77,21 +77,16 @@ in dir ./u-boot-x-x-x/ please first check: - in ./include/configs/cobra5272.h + in ./configs/cobra5272_defconfig - CONFIG_MONITOR_IS_IN_RAM has to be undefined, e. g. as follows: - - #if 0 - #define CONFIG_MONITOR_IS_IN_RAM - /* define if monitor is started from a pre-loader */ - #endif + CONFIG_MONITOR_IS_IN_RAM has to be not present in the file => u-boot as single bootloader starting from flash - in board/cobra5272/config.mk CONFIG_TEXT_BASE should be + in configs/cobra5272_defconfig CONFIG_TEXT_BASE should be - CONFIG_TEXT_BASE = 0xffe00000 + CONFIG_TEXT_BASE=0xffe00000 => linking address for u-boot as single bootloader stored in flash
@@ -115,22 +110,18 @@ in dir ./u-boot-x-x-x/ host> make distclean please modify the settings: + in ./configs/cobra5272_defconfig - in ./include/configs/cobra5272.h - - CONFIG_MONITOR_IS_IN_RAM now has to be defined, e. g. as follows: + CONFIG_MONITOR_IS_IN_RAM now has to be enabled, e. g. as follows: - #if 1 - #define CONFIG_MONITOR_IS_IN_RAM - /*define if monitor is started from a pre-loader */ - #endif + CONFIG_MONITOR_IS_IN_RAM=y => u-boot as RAM version, chainloaded by another bootloader or using bdm cable - in board/cobra5272/config.mk CONFIG_TEXT_BASE should be + in configs/cobra5272_defconfig CONFIG_TEXT_BASE should be - CONFIG_TEXT_BASE = 0x00020000 + CONFIG_TEXT_BASE=0x00020000 => target linking address for RAM
configs/10m50_defconfig +1 -0
@@ -1,5 +1,6 @@ CONFIG_NIOS2=y CONFIG_SYS_CONFIG_NAME="10m50_devboard" +CONFIG_MONITOR_IS_IN_RAM=y CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1
configs/3c120_defconfig +1 -0
@@ -1,5 +1,6 @@ CONFIG_NIOS2=y CONFIG_SYS_CONFIG_NAME="3c120_devboard" +CONFIG_MONITOR_IS_IN_RAM=y CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1
doc/arch/m68k.rst +2 -2
@@ -93,10 +93,10 @@ Configuration to use a pre-loader ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ If U-Boot should be loaded to RAM and started by a pre-loader -CONFIG_MONITOR_IS_IN_RAM must be defined. If it is defined the +CONFIG_MONITOR_IS_IN_RAM must be enabled. If it is enabled the initial vector table and basic processor initialization will not be compiled in. The start address of U-Boot must be adjusted in -the boards config header file (CONFIG_SYS_MONITOR_BASE) and Makefile +the boards defconfig file (CONFIG_SYS_MONITOR_BASE) and Makefile (CONFIG_TEXT_BASE) to the load address. ColdFire CPU specific options/settings
include/configs/10m50_devboard.h +0 -1
@@ -32,6 +32,5 @@*/ #define CFG_SYS_SDRAM_BASE 0xc8000000#define CFG_SYS_SDRAM_SIZE 0x08000000 -#define CONFIG_MONITOR_IS_IN_RAM #endif /* __CONFIG_H */
include/configs/3c120_devboard.h +0 -1
@@ -28,6 +28,5 @@*/ #define CFG_SYS_SDRAM_BASE 0xD0000000#define CFG_SYS_SDRAM_SIZE 0x08000000 -#define CONFIG_MONITOR_IS_IN_RAM #endif /* __CONFIG_H */
include/configs/M5249EVB.h +0 -2
@@ -20,8 +20,6 @@#define CFG_SYS_UART_PORT (0) -#undef CONFIG_MONITOR_IS_IN_RAM/* no pre-loader required!!! ;-) */ -/* * Clock configuration: enable only one of the following options */
include/configs/M5272C3.h +0 -2
@@ -19,8 +19,6 @@#define CFG_SYS_UART_PORT (0) -#undef CONFIG_MONITOR_IS_IN_RAM/* define if monitor is started from a pre-loader */ -/* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */
include/configs/M5282EVB.h +0 -2
@@ -19,8 +19,6 @@#define CFG_SYS_UART_PORT (0) -#undef CONFIG_MONITOR_IS_IN_RAM/* define if monitor is started from a pre-loader */ -/* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */
include/configs/astro_mcf5373l.h +0 -25
@@ -38,16 +38,6 @@#error No card type defined!#endif -/* -* CONFIG_RAM defines if u-boot is loaded via BDM (or started from -* a different bootloader that has already performed RAM setup) or -* started directly from flash, which is the regular case for production -* boards. -*/ -#ifdef CONFIG_RAM -#define CONFIG_MONITOR_IS_IN_RAM -#endif -/* I2C */ /*
@@ -69,21 +59,6 @@#define CFG_SYS_UART_PORT (2)#define CFG_SYS_UART2_ALT3_GPIO -/* -* Configuration for environment -* Environment is located in the last sector of the flash -*/ - -#ifndef CONFIG_MONITOR_IS_IN_RAM -#else -/* -* environment in RAM - This is used to use a single PC-based application -* to load an image, load U-Boot, load an environment and then start U-Boot -* to execute the commands from the environment. Feedback is done via setting -* and reading memory locations. -*/ -#endif -/* here we put our FPGA configuration... */ /* Define user parameters that have to be customized most likely */
include/configs/cobra5272.h +0 -21
@@ -42,27 +42,6 @@#define CFG_SYS_UART_PORT (0) -/* --- -* CONFIG_MONITOR_IS_IN_RAM defines if u-boot is started from a different -* bootloader residing in flash ('chainloading'); if you want to use -* chainloading or want to compile a u-boot binary that can be loaded into -* RAM via BDM set -* "#if 0" to "#if 1" -* You will need a first stage bootloader then, e. g. colilo or a working BDM -* cable (Background Debug Mode) -* -* Setting #if 0: u-boot will start from flash and relocate itself to RAM -* -* Please do not forget to modify the setting of CONFIG_TEXT_BASE -* in board/cobra5272/config.mk accordingly (#if 0: 0xffe00000; #if 1: 0x20000) -* -* --- -*/ - -#if 0 -#define CONFIG_MONITOR_IS_IN_RAM /* monitor is started from a preloader */ -#endif -/* --- * Configuration for environment * Environment is embedded in u-boot in the second sector of the flash
include/configs/eb_cpu5282.h +0 -2
@@ -14,8 +14,6 @@#define CFG_SYS_UART_PORT (0) -#undef CONFIG_MONITOR_IS_IN_RAM/* starts uboot direct */ -/*----------------------------------------------------------------------* * Options * *----------------------------------------------------------------------*/
Signature · 1 line
2.25.1
PATCH 27/41 Convert CONFIG_MXC_NAND_HWECC to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_MXC_NAND_HWECC
--- configs/m53menlo_defconfig | 1 + drivers/mtd/nand/raw/Kconfig | 4 ++++ include/configs/m53menlo.h | 1 - 3 files changed, 5 insertions(+), 1 deletion(-)
configs/m53menlo_defconfig +1 -0
@@ -88,6 +88,7 @@ CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_MXC=y +CONFIG_MXC_NAND_HWECC=y CONFIG_SYS_NAND_BLOCK_SIZE=0x20000 CONFIG_SYS_NAND_PAGE_COUNT=0x40 CONFIG_SYS_NAND_PAGE_SIZE=0x800
drivers/mtd/nand/raw/Kconfig +4 -0
@@ -479,6 +479,10 @@ config SYS_NAND_SIZE depends on NAND_MXC && SPL_NAND_SUPPORT default 268435456 +config MXC_NAND_HWECC + bool "Hardware ECC support in MXC NAND" + depends on NAND_MXC + config NAND_MXS bool "MXS NAND support" depends on MX23 || MX28 || MX6 || MX7 || IMX8 || IMX8M
include/configs/m53menlo.h +0 -1
@@ -48,7 +48,6 @@#define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI#define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR#define CFG_SYS_NAND_LARGEPAGE -#define CONFIG_MXC_NAND_HWECC #endif /*
Signature · 1 line
2.25.1
PATCH 28/41 etamin: Rework CONFIG_NAND_CS_INIT
In reply to Tom RiniEnable this in the board Kconfig file, but then check for it via CONFIG_IS_ENABLED so that it will only be true in the non-SPL case, as is done today. As part of this we move some defines local to where they are used as it's board specific.
--- board/siemens/common/board.c | 2 +- board/siemens/draco/Kconfig | 2 ++ board/siemens/draco/board.c | 9 ++++++++- include/configs/etamin.h | 12 +----------- 4 files changed, 12 insertions(+), 13 deletions(-)
board/siemens/common/board.c +1 -1
@@ -93,7 +93,7 @@ int board_init(void)gpmc_init (); -#ifdef CONFIG_NAND_CS_INIT +#if CONFIG_IS_ENABLED (NAND_CS_INIT )board_nand_cs_init ();#endif
board/siemens/draco/Kconfig +2 -0
@@ -60,4 +60,6 @@ config SYS_SOC config SYS_CONFIG_NAME default "etamin" +config NAND_CS_INIT + def_bool y endif
board/siemens/draco/board.c +8 -1
@@ -370,7 +370,14 @@ U_BOOT_CMD(#endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */ #endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */ -#ifdef CONFIG_NAND_CS_INIT +#if CONFIG_IS_ENABLED (NAND_CS_INIT ) +#define ETAMIN_NAND_GPMC_CONFIG1 0x00000800 +#define ETAMIN_NAND_GPMC_CONFIG2 0x001e1e00 +#define ETAMIN_NAND_GPMC_CONFIG3 0x001e1e00 +#define ETAMIN_NAND_GPMC_CONFIG4 0x16051807 +#define ETAMIN_NAND_GPMC_CONFIG5 0x00151e1e +#define ETAMIN_NAND_GPMC_CONFIG6 0x16000f80 +/* GPMC definitions for second nand cs1 */ static const u32 gpmc_nand_config[] = { ETAMIN_NAND_GPMC_CONFIG1,
include/configs/etamin.h +1 -11
@@ -127,16 +127,6 @@"bootm ${kloadaddr} - ${loadaddr}\0" \COMMON_ENV_NAND_CMDS -#ifndef CONFIG_SPL_BUILD - -#define CONFIG_NAND_CS_INIT -#define ETAMIN_NAND_GPMC_CONFIG1 0x00000800 -#define ETAMIN_NAND_GPMC_CONFIG2 0x001e1e00 -#define ETAMIN_NAND_GPMC_CONFIG3 0x001e1e00 -#define ETAMIN_NAND_GPMC_CONFIG4 0x16051807 -#define ETAMIN_NAND_GPMC_CONFIG5 0x00151e1e -#define ETAMIN_NAND_GPMC_CONFIG6 0x16000f80 -/* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \"hostname=etamin\0" \
@@ -147,5 +137,5 @@ CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ CONFIG_ENV_SETTINGS_NAND_V2 -#endif /* CONFIG_SPL_BUILD */ +#endif /* ! __CONFIG_ETAMIN_H */
Signature · 1 line
2.25.1
PATCH 29/41 Convert CONFIG_OVERWRITE_ETHADDR_ONCE to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_OVERWRITE_ETHADDR_ONCE
--- README | 7 ------- configs/M5253DEMO_defconfig | 1 + configs/M5275EVB_defconfig | 1 + configs/eb_cpu5282_defconfig | 1 + configs/eb_cpu5282_internal_defconfig | 1 + env/Kconfig | 9 +++++++++ include/configs/M5253DEMO.h | 2 -- include/configs/M5275EVB.h | 4 ---- include/configs/eb_cpu5282.h | 4 ---- 9 files changed, 13 insertions(+), 17 deletions(-)
README +0 -7
@@ -1071,13 +1071,6 @@ The following options need to be configured: completely disabled. Anybody can change or delete these parameters. - Alternatively, if you define _both_ an ethaddr in the - default env _and_ CONFIG_OVERWRITE_ETHADDR_ONCE, a default - Ethernet address is installed in the environment, - which can be changed exactly ONCE by the user. [The - serial# is unaffected by this, i. e. it remains - read-only.] - The same can be accomplished in a more flexible way for any variable by configuring the type of access to allow for those variables in the ".flags" variable
configs/M5253DEMO_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_MAC_PARTITION=y +CONFIG_OVERWRITE_ETHADDR_ONCE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_USE_HOSTNAME=y CONFIG_HOSTNAME="M5253DEMO"
configs/M5275EVB_defconfig +1 -0
@@ -31,6 +31,7 @@ CONFIG_CMD_MII=y CONFIG_MII_INIT=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y +CONFIG_OVERWRITE_ETHADDR_ONCE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y CONFIG_SYS_RX_ETH_BUFFER=8
configs/eb_cpu5282_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_CMD_MII=y CONFIG_MII_INIT=y CONFIG_CMD_DATE=y +CONFIG_OVERWRITE_ETHADDR_ONCE=y CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y CONFIG_SYS_RX_ETH_BUFFER=8 CONFIG_SYS_I2C_LEGACY=y
configs/eb_cpu5282_internal_defconfig +1 -0
@@ -30,6 +30,7 @@ CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_CMD_MII=y CONFIG_MII_INIT=y CONFIG_CMD_DATE=y +CONFIG_OVERWRITE_ETHADDR_ONCE=y CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y CONFIG_SYS_RX_ETH_BUFFER=8 CONFIG_SYS_I2C_LEGACY=y
env/Kconfig +9 -0
@@ -30,6 +30,15 @@ config ENV_OVERWRITE Use this to permit overriding of certain environmental variables like Ethernet and Serial +config OVERWRITE_ETHADDR_ONCE + bool "Enable overwriting ethaddr environment variables once" + depends on !ENV_OVERWRITE + help + Enable this to allow for the ethaddr environment variables to be + overwritten one time per boot, only. This allows for a default + to be installed in the environment, which can be changed exactly ONCE + by the user. + config ENV_MIN_ENTRIES int "Minimum number of entries in the environment hashtable" default 64
include/configs/M5253DEMO.h +0 -2
@@ -20,8 +20,6 @@ env/embedded.o(.text*);#ifdef CONFIG_DRIVER_DM9000 -# define CONFIG_OVERWRITE_ETHADDR_ONCE -# define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "inpclk=" __stringify(CONFIG_SYS_INPUT_CLKSRC) "\0" \
include/configs/M5275EVB.h +0 -4
@@ -38,10 +38,6 @@#define CFG_SYS_I2C_PINMUX_CLR (0xFFF0)#define CFG_SYS_I2C_PINMUX_SET (0x000F) -#ifdef CONFIG_MCFFEC -# define CONFIG_OVERWRITE_ETHADDR_ONCE -#endif /* FEC_ENET */ -#define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \
include/configs/eb_cpu5282.h +0 -4
@@ -42,10 +42,6 @@* Network * *----------------------------------------------------------------------*/ -#ifdef CONFIG_MCFFEC -#define CONFIG_OVERWRITE_ETHADDR_ONCE -#endif -/*------------------------------------------------------------------------- * Low Level Configuration Settings * (address mappings, register initial values, etc.)
Signature · 1 line
2.25.1
PATCH 30/41 Convert CONFIG_PEN_ADDR_BIG_ENDIAN to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_PEN_ADDR_BIG_ENDIAN
--- arch/arm/Kconfig | 3 +++ arch/arm/cpu/armv7/ls102xa/Kconfig | 3 +++ include/configs/ls1021aiot.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - 5 files changed, 6 insertions(+), 3 deletions(-)
arch/arm/Kconfig +3 -0
@@ -1645,6 +1645,7 @@ config TARGET_LS1021AQDS select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select LS1_DEEP_SLEEP + select PEN_ADDR_BIG_ENDIAN select SUPPORT_SPL select SYS_FSL_DDR select FSL_DDR_INTERACTIVE
@@ -1663,6 +1664,7 @@ config TARGET_LS1021ATWR select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select LS1_DEEP_SLEEP + select PEN_ADDR_BIG_ENDIAN select SUPPORT_SPL select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI select GPIO_EXTRA_HEADER
@@ -1727,6 +1729,7 @@ config TARGET_LS1021AIOT select CPU_V7A select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT + select PEN_ADDR_BIG_ENDIAN select SUPPORT_SPL select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI select GPIO_EXTRA_HEADER
arch/arm/cpu/armv7/ls102xa/Kconfig +3 -0
@@ -51,6 +51,9 @@ config MAX_CPUS cores, count the reserved ports. This will allocate enough memory in spin table to properly handle all cores. +config PEN_ADDR_BIG_ENDIAN + bool + config SYS_CCI400_OFFSET hex "Offset for CCI400 base" depends on SYS_FSL_HAS_CCI400
include/configs/ls1021aiot.h +0 -1
@@ -68,7 +68,6 @@#define FSL_PCIE_COMPAT "fsl,ls1021a-pcie" -#define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_SMP_PEN_ADDR 0x01ee0200#define HWCONFIG_BUFFER_SIZE 256
include/configs/ls1021aqds.h +0 -1
@@ -242,7 +242,6 @@* MMC */ -#define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_SMP_PEN_ADDR 0x01ee0200#define HWCONFIG_BUFFER_SIZE 256
include/configs/ls1021atwr.h +0 -1
@@ -152,7 +152,6 @@/* GPIO */ -#define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_SMP_PEN_ADDR 0x01ee0200#define HWCONFIG_BUFFER_SIZE 256
Signature · 1 line
2.25.1
PATCH 31/41 arm: ti814x: Remove remaining support code
In reply to Tom RiniWhen the ti814x_evm config was removed most, but not all, of the relevant support code was remove. Get rid of what was missed.
--- arch/arm/include/asm/arch-am33xx/clock.h | 2 +- .../include/asm/arch-am33xx/clock_ti81xx.h | 36 +- arch/arm/include/asm/arch-am33xx/hardware.h | 2 - .../include/asm/arch-am33xx/hardware_ti814x.h | 60 --- .../include/asm/arch-am33xx/mmc_host_def.h | 5 +- arch/arm/include/asm/arch-am33xx/mux.h | 2 - arch/arm/include/asm/arch-am33xx/mux_ti814x.h | 311 ------------- arch/arm/include/asm/arch-am33xx/omap.h | 2 +- arch/arm/include/asm/arch-am33xx/spl.h | 16 +- arch/arm/mach-omap2/Kconfig | 8 - arch/arm/mach-omap2/am33xx/Kconfig | 10 - arch/arm/mach-omap2/am33xx/Makefile | 1 - arch/arm/mach-omap2/am33xx/clock_ti814x.c | 410 ------------------ arch/arm/mach-omap2/am33xx/emif4.c | 20 - arch/arm/mach-omap2/boot-common.c | 2 +- drivers/i2c/Kconfig | 2 +- drivers/net/ti/cpsw.c | 4 - include/configs/ti814x_evm.h | 102 ----- 18 files changed, 12 insertions(+), 983 deletions(-) delete mode 100644 arch/arm/include/asm/arch-am33xx/hardware_ti814x.h delete mode 100644 arch/arm/include/asm/arch-am33xx/mux_ti814x.h delete mode 100644 arch/arm/mach-omap2/am33xx/clock_ti814x.c delete mode 100644 include/configs/ti814x_evm.h
arch/arm/include/asm/arch-am33xx/clock.h +1 -1
@@ -13,7 +13,7 @@#include <asm/arch/clocks_am33xx.h> #include <asm/arch/hardware.h> -#if defined(CONFIG_TI816X ) || defined(CONFIG_TI814X ) +#if defined(CONFIG_TI816X )#include <asm/arch/clock_ti81xx.h> #endif
arch/arm/include/asm/arch-am33xx/clock_ti81xx.h +6 -30
@@ -44,9 +44,7 @@ struct cm_alwon {unsigned int mmu_clkstctrl;unsigned int mmucfg_clkstctrl;unsigned int ocmc0clkstctrl; -#if defined(CONFIG_TI814X ) -unsigned int vcpclkstctrl; -#elif defined(CONFIG_TI816X ) +#if defined(CONFIG_TI816X )unsigned int ocmc1clkstctrl;#endif unsigned int mpuclkstctrl;
@@ -67,16 +65,7 @@ struct cm_alwon {unsigned int gpio1clkctrl;unsigned int i2c0clkctrl;unsigned int i2c1clkctrl; -#if defined(CONFIG_TI814X ) -unsigned int mcasp345clkctrl; -unsigned int atlclkctrl; -unsigned int mlbclkctrl; -unsigned int pataclkctrl; -unsigned int resv1[1 ]; -unsigned int uart3clkctrl; -unsigned int uart4clkctrl; -unsigned int uart5clkctrl; -#elif defined(CONFIG_TI816X ) +#if defined(CONFIG_TI816X )unsigned int resv1[1 ];unsigned int timer1clkctrl;unsigned int timer2clkctrl;
@@ -93,16 +82,12 @@ struct cm_alwon {unsigned int mmudataclkctrl;unsigned int resv2[2 ];unsigned int mmucfgclkctrl; -#if defined(CONFIG_TI814X ) -unsigned int resv3[2 ]; -#elif defined(CONFIG_TI816X ) +#if defined(CONFIG_TI816X )unsigned int resv3[1 ];unsigned int sdioclkctrl;#endif unsigned int ocmc0clkctrl; -#if defined(CONFIG_TI814X ) -unsigned int vcpclkctrl; -#elif defined(CONFIG_TI816X ) +#if defined(CONFIG_TI816X )unsigned int ocmc1clkctrl;#endif unsigned int resv4[2 ];
@@ -112,9 +97,7 @@ struct cm_alwon {unsigned int ethernet0clkctrl;unsigned int ethernet1clkctrl;unsigned int mpuclkctrl; -#if defined(CONFIG_TI814X ) -unsigned int debugssclkctrl; -#elif defined(CONFIG_TI816X ) +#if defined(CONFIG_TI816X )unsigned int resv6[1 ];#endif unsigned int l3clkctrl;
@@ -126,14 +109,7 @@ struct cm_alwon {unsigned int tptc1clkctrl;unsigned int tptc2clkctrl;unsigned int tptc3clkctrl; -#if defined(CONFIG_TI814X ) -unsigned int resv6[4 ]; -unsigned int dcan01clkctrl; -unsigned int mmchs0clkctrl; -unsigned int mmchs1clkctrl; -unsigned int mmchs2clkctrl; -unsigned int custefuseclkctrl; -#elif defined(CONFIG_TI816X ) +#if defined(CONFIG_TI816X )unsigned int sr0clkctrl;unsigned int sr1clkctrl;#endif
arch/arm/include/asm/arch-am33xx/hardware.h +0 -2
@@ -16,8 +16,6 @@#include <asm/arch/hardware_am33xx.h> #elif defined(CONFIG_TI816X )#include <asm/arch/hardware_ti816x.h> -#elif defined(CONFIG_TI814X ) -#include <asm/arch/hardware_ti814x.h> #elif defined(CONFIG_AM43XX )#include <asm/arch/hardware_am43xx.h> #endif
arch/arm/include/asm/arch-am33xx/hardware_ti814x.h deleted +0 -60
60 lines not on this page · raw message
arch/arm/include/asm/arch-am33xx/mmc_host_def.h +1 -4
@@ -24,10 +24,7 @@#define OMAP_HSMMC1_BASE 0x48060000#define OMAP_HSMMC2_BASE 0x481D8000 -#if defined(CONFIG_TI814X ) -#undef MMC_CLOCK_REFERENCE -#define MMC_CLOCK_REFERENCE 192/* MHz */ -#elif defined(CONFIG_TI816X ) +#if defined(CONFIG_TI816X )#undef MMC_CLOCK_REFERENCE#define MMC_CLOCK_REFERENCE 48/* MHz */ #endif
arch/arm/include/asm/arch-am33xx/mux.h +0 -2
@@ -20,8 +20,6 @@#ifdef CONFIG_AM33XX #include <asm/arch/mux_am33xx.h> -#elif defined(CONFIG_TI814X ) -#include <asm/arch/mux_ti814x.h> #elif defined(CONFIG_TI816X )#include <asm/arch/mux_ti816x.h> #elif defined(CONFIG_AM43XX )
arch/arm/include/asm/arch-am33xx/mux_ti814x.h deleted +0 -311
311 lines not on this page · raw message
arch/arm/include/asm/arch-am33xx/omap.h +1 -1
@@ -20,7 +20,7 @@#define NON_SECURE_SRAM_START 0x402F0400#define NON_SECURE_SRAM_END 0x40310000#define NON_SECURE_SRAM_IMG_END 0x4030B800 -#elif defined(CONFIG_TI816X ) || defined(CONFIG_TI814X ) +#elif defined(CONFIG_TI816X )#define NON_SECURE_SRAM_START 0x40300000#define NON_SECURE_SRAM_END 0x40320000#define NON_SECURE_SRAM_IMG_END 0x4031B800
arch/arm/include/asm/arch-am33xx/spl.h +1 -15
@@ -9,21 +9,7 @@#define BOOT_DEVICE_NONE 0x00#define BOOT_DEVICE_MMC2_2 0xFF -#if defined(CONFIG_TI814X ) -#define BOOT_DEVICE_XIP 0x01 -#define BOOT_DEVICE_XIPWAIT 0x02 -#define BOOT_DEVICE_NAND 0x05 -#define BOOT_DEVICE_NAND_I2C 0x06 -#define BOOT_DEVICE_MMC2 0x08/* ROM only supports 2nd instance. */ -#define BOOT_DEVICE_MMC1 0x09 -#define BOOT_DEVICE_SPI 0x15 -#define BOOT_DEVICE_UART 0x41 -#define BOOT_DEVICE_USBETH 0x44 -#define BOOT_DEVICE_CPGMAC 0x46 - -#define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC2 -#define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC1 -#elif defined(CONFIG_TI816X ) +#if defined(CONFIG_TI816X )#define BOOT_DEVICE_XIP 0x01#define BOOT_DEVICE_XIPWAIT 0x02#define BOOT_DEVICE_NAND 0x03
arch/arm/mach-omap2/Kconfig +0 -8
@@ -75,14 +75,6 @@ config OMAP54XX imply SPL_SERIAL imply SYS_I2C_OMAP24XX -config TI814X - bool "TI814X SoC" - select SPECIFY_CONSOLE_INDEX - help - Support for AM335x SOC from Texas Instruments. - The AM335x high performance SOC features a Cortex-A8 - ARM core and more. - config TI816X bool "TI816X SoC" select SPECIFY_CONSOLE_INDEX
arch/arm/mach-omap2/am33xx/Kconfig +0 -10
@@ -8,16 +8,6 @@ config TARGET_TI816X_EVM endif -if TI814X - -config TARGET_TI814X_EVM - bool "Support ti814x_evm" - help - This option specifies support for the TI8148 - EVM development platform. - -endif - if AM33XX config AM33XX_CHILISOM
arch/arm/mach-omap2/am33xx/Makefile +0 -1
@@ -3,7 +3,6 @@ # Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ obj-$(CONFIG_AM33XX) += clock_am33xx.o -obj-$(CONFIG_TI814X) += clock_ti814x.o obj-$(CONFIG_AM43XX) += clock_am43xx.o ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX),)
arch/arm/mach-omap2/am33xx/clock_ti814x.c deleted +0 -410
410 lines not on this page · raw message
arch/arm/mach-omap2/am33xx/emif4.c +0 -20
@@ -28,26 +28,6 @@ static struct cm_device_inst *cm_device = (struct cm_device_inst *)CM_DEVICE_INST ;#endif -#ifdef CONFIG_TI814X -void config_dmm (const struct dmm_lisa_map_regs *regs) -{ -struct dmm_lisa_map_regs *hw_lisa_map_regs = - (struct dmm_lisa_map_regs *)DMM_BASE ; - -enable_dmm_clocks (); - -writel (0 , &hw_lisa_map_regs->dmm_lisa_map_3); -writel (0 , &hw_lisa_map_regs->dmm_lisa_map_2); -writel (0 , &hw_lisa_map_regs->dmm_lisa_map_1); -writel (0 , &hw_lisa_map_regs->dmm_lisa_map_0); - -writel (regs->dmm_lisa_map_3, &hw_lisa_map_regs->dmm_lisa_map_3); -writel (regs->dmm_lisa_map_2, &hw_lisa_map_regs->dmm_lisa_map_2); -writel (regs->dmm_lisa_map_1, &hw_lisa_map_regs->dmm_lisa_map_1); -writel (regs->dmm_lisa_map_0, &hw_lisa_map_regs->dmm_lisa_map_0); -} -#endif -static void config_vtp (int nr) { writel(readl(&vtpreg[nr]->vtp0ctrlreg) | VTP_CTRL_ENABLE,
arch/arm/mach-omap2/boot-common.c +1 -1
@@ -181,7 +181,7 @@ void save_omap_boot_params(void) gd->arch.omap_boot_mode = boot_mode; -#if !defined(CONFIG_TI814X ) && !defined(CONFIG_TI816X ) && \ +#if !defined(CONFIG_TI816X ) && \ !defined(CONFIG_AM33XX ) && !defined(CONFIG_AM43XX )/* CH flags */
drivers/i2c/Kconfig +1 -1
@@ -704,7 +704,7 @@ config SYS_I2C_BUS_MAX depends on ARCH_OMAP2PLUS || ARCH_SOCFPGA default 2 if TI816X default 3 if OMAP34XX || AM33XX || AM43XX - default 4 if ARCH_SOCFPGA || OMAP44XX || TI814X + default 4 if ARCH_SOCFPGA || OMAP44XX default 5 if OMAP54XX help Define the maximum number of available I2C buses.
drivers/net/ti/cpsw.c +0 -4
@@ -79,10 +79,6 @@ struct cpsw_slave_regs {u32 tx_pri_map;#ifdef CONFIG_AM33XX u32 gap_thresh; -#elif defined(CONFIG_TI814X ) -u32 ts_ctl; -u32 ts_seq_ltype; -u32 ts_vlan;#endif u32 sa_lo;u32 sa_hi;
include/configs/ti814x_evm.h deleted +0 -102
102 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 32/41 powerpc: Migrate CONFIG_PPC_SPINTABLE_COMPATIBLE to Kconfig
In reply to Tom RiniMove this symbol to Kconfig, and preserve the current behavior. The help text here comes from where the relevant code is implemented and it is quite likely at this point in time we could either disable this option or at least make it configurable.
--- arch/powerpc/cpu/mpc85xx/Kconfig | 13 +++++++++++++ arch/powerpc/include/asm/config_mpc85xx.h | 6 ------ 2 files changed, 13 insertions(+), 6 deletions(-)
arch/powerpc/cpu/mpc85xx/Kconfig +13 -0
@@ -1,6 +1,19 @@ menu "mpc85xx CPU" depends on MPC85xx +config PPC_SPINTABLE_COMPATIBLE + depends on MP + def_bool y + help + To comply with ePAPR 1.1, the spin table has been moved to + cache-enabled memory. Old OS may not work with this change. A patch + is waiting to be accepted for Linux kernel. Other OS needs similar + fix to spin table. For OSes with old spin table code, we can enable + this temporary fix by setting environmental variable + "spin_table_compat". For new OSes, set "spin_table_compat=no". After + Linux is fixed, we can remove this macro and related code. For now, + it is enabled by default. + config SYS_CPU default "mpc85xx"
arch/powerpc/include/asm/config_mpc85xx.h +0 -6
@@ -8,12 +8,6 @@/* SoC specific defines for Freescale MPC85xx (PQ3) and QorIQ processors */ -/* -* This macro should be removed when we no longer care about backwards -* compatibility with older operating systems. -*/ -#define CONFIG_PPC_SPINTABLE_COMPATIBLE -#include <fsl_ddrc_version.h> #if defined(CONFIG_ARCH_MPC8548 )
Signature · 1 line
2.25.1
PATCH 33/41 sandbox: Finish migration to Kconfig
In reply to Tom RiniStop using CONFIG_SANDBOX_ARCH and use CONFIG_SANDBOX instead. For the SPI related defines, set them directly in Kconfig. This now empties arch/sandbox/include/asm/config.h.
--- arch/sandbox/include/asm/config.h | 10 ---------- drivers/adc/adc-uclass.c | 2 +- drivers/spi/Kconfig | 10 ++++++++++ 3 files changed, 11 insertions(+), 11 deletions(-)
arch/sandbox/include/asm/config.h +0 -10
@@ -6,14 +6,4 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ -#define CONFIG_SANDBOX_ARCH - -/* Used by drivers/spi/sandbox_spi.c and arch/sandbox/include/asm/state.h */ -#ifndef CONFIG_SANDBOX_SPI_MAX_BUS -#define CONFIG_SANDBOX_SPI_MAX_BUS 1 -#endif -#ifndef CONFIG_SANDBOX_SPI_MAX_CS -#define CONFIG_SANDBOX_SPI_MAX_CS 10 -#endif -#endif
drivers/adc/adc-uclass.c +1 -1
@@ -22,7 +22,7 @@#define CHECK_MASK (!CHECK_NUMBER)/* TODO: add support for timer uclass (for early calls) */ -#ifdef CONFIG_SANDBOX_ARCH +#ifdef CONFIG_SANDBOX #define sdelay (x) udelay(x)#else extern void sdelay (unsigned long loops);
drivers/spi/Kconfig +10 -0
@@ -429,6 +429,16 @@ config SANDBOX_SPI }; }; +config SANDBOX_SPI_MAX_BUS + int + depends on SANDBOX + default 1 + +config SANDBOX_SPI_MAX_CS + int + depends on SANDBOX + default 10 + config SPI_ASPEED_SMC bool "ASPEED SPI flash controller driver" depends on DM_SPI && SPI_MEM
Signature · 1 line
2.25.1
Re: [PATCH 33/41] sandbox: Finish migration to Kconfig
Hi Tom,
Quoted 5 lines · Tom Rini
Stop using
CONFIG_SANDBOX_ARCHand useCONFIG_SANDBOXinstead. For the SPI related defines, set them directly inKconfig. This now emptiesarch/sandbox/include/asm/config.h.
Quoted 7 lines
Cc Simon Glass <[email protected]>Signed-off-by Tom Rini <[email protected]>--- arch/sandbox/include/asm/config.h | 10 ---------- drivers/adc/adc-uclass.c | 2 +- drivers/spi/Kconfig | 10 ++++++++++ 3 files changed, 11 insertions(+), 11 deletions(-)
PATCH 34/41 Convert CONFIG_STANDALONE_LOAD_ADDR to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_STANDALONE_LOAD_ADDR
--- README | 7 ------- api/Kconfig | 19 +++++++++++++++++++ arch/arc/config.mk | 3 --- arch/arm/config.mk | 8 -------- .../include/asm/arch-fsl-layerscape/config.h | 2 -- arch/m68k/config.mk | 2 -- arch/microblaze/config.mk | 2 -- arch/mips/config.mk | 2 -- arch/nios2/config.mk | 2 -- arch/powerpc/config.mk | 1 - arch/riscv/config.mk | 2 -- arch/sh/config.mk | 1 - arch/x86/config.mk | 2 -- configs/display5_defconfig | 1 + configs/display5_factory_defconfig | 1 + configs/microchip_mpfs_icicle_defconfig | 1 + configs/qemu-riscv32_defconfig | 1 + configs/qemu-riscv32_smode_defconfig | 1 + configs/qemu-riscv32_spl_defconfig | 1 + configs/qemu-riscv64_defconfig | 1 + configs/qemu-riscv64_smode_defconfig | 1 + configs/qemu-riscv64_spl_defconfig | 1 + configs/sifive_unleashed_defconfig | 1 + configs/sifive_unmatched_defconfig | 1 + configs/xtfpga_defconfig | 1 + include/configs/display5.h | 2 -- include/configs/microchip_mpfs_icicle.h | 2 -- include/configs/opos6uldev.h | 1 - include/configs/qemu-riscv.h | 2 -- include/configs/sifive-unleashed.h | 2 -- include/configs/sifive-unmatched.h | 2 -- include/configs/sunxi-common.h | 3 --- include/configs/xtfpga.h | 16 ---------------- 33 files changed, 31 insertions(+), 64 deletions(-)
README +0 -7
@@ -1166,13 +1166,6 @@ The following options need to be configured: this is instead controlled by the value of /config/load-environment. - CONFIG_STANDALONE_LOAD_ADDR - - This option defines a board specific value for the - address where standalone program gets loaded, thus - overwriting the architecture dependent default - settings. - - Automatic software updates via TFTP server CONFIG_UPDATE_TFTP CONFIG_UPDATE_TFTP_CNT_MAX
api/Kconfig +19 -0
@@ -11,3 +11,22 @@ config SYS_MMC_MAX_DEVICE default 1 endmenu + +config STANDALONE_LOAD_ADDR + hex "Address in memory to link standalone applications to" + default 0xffffffff80200000 if MIPS && 64BIT + default 0x8c000000 if SH + default 0x82000000 if ARC + default 0x80f00000 if MICROBLAZE + default 0x80300000 if ARCH_OMAP2PLUS || FSL_LSCH2 || FSL_LSCH3 + default 0x80200000 if MIPS && 32BIT + default 0x0c100000 if ARM + default 0x02000000 if NIOS2 + default 0x00040000 if PPC || X86 + default 0x00020000 if M68K + default 0x0 if RISCV + default SYS_LOAD_ADDR + help + This option defines a board specific value for the address where + standalone program gets loaded, thus overwriting the architecture + dependent default settings.
arch/arc/config.mk +0 -3
@@ -21,6 +21,3 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -fno-common # Needed for relocation LDFLAGS_FINAL += -pie --gc-sections - -# Load address for standalone apps -CONFIG_STANDALONE_LOAD_ADDR ?= 0x82000000
arch/arm/config.mk +0 -8
@@ -3,14 +3,6 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, [email protected]. -ifndef CONFIG_STANDALONE_LOAD_ADDR -ifneq ($(CONFIG_ARCH_OMAP2PLUS),) -CONFIG_STANDALONE_LOAD_ADDR = 0x80300000 -else -CONFIG_STANDALONE_LOAD_ADDR = 0xc100000 -endif -endif - CFLAGS_NON_EFI := -fno-pic -ffixed-r9 -ffunction-sections -fdata-sections \ -fstack-protector-strong CFLAGS_EFI := -fpic -fshort-wchar
arch/arm/include/asm/arch-fsl-layerscape/config.h +0 -2
@@ -14,8 +14,6 @@#include <linux/bitops.h> #endif -#define CONFIG_STANDALONE_LOAD_ADDR 0x80300000 -/* * Reserve secure memory * To be aligned with MMU block size
arch/m68k/config.mk +0 -2
@@ -3,8 +3,6 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, [email protected]. -CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000 - PLATFORM_CPPFLAGS += -D__M68K__ KBUILD_LDFLAGS += -n PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
arch/microblaze/config.mk +0 -2
@@ -6,8 +6,6 @@ # (C) Copyright 2004 Atmark Techno, Inc. # Yasushi SHOJI <[email protected]> -CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000 - PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__ PLATFORM_CPPFLAGS += -fdata-sections -ffunction-sections
arch/mips/config.mk +0 -2
@@ -25,14 +25,12 @@ ifdef CONFIG_32BIT PLATFORM_CPPFLAGS += -mabi=32 KBUILD_LDFLAGS += -m $(32bit-emul) OBJCOPYFLAGS += -O $(32bit-bfd) -CONFIG_STANDALONE_LOAD_ADDR ?= 0x80200000 endif ifdef CONFIG_64BIT PLATFORM_CPPFLAGS += -mabi=64 KBUILD_LDFLAGS += -m$(64bit-emul) OBJCOPYFLAGS += -O $(64bit-bfd) -CONFIG_STANDALONE_LOAD_ADDR ?= 0xffffffff80200000 endif PLATFORM_CPPFLAGS += -D__MIPS__
arch/nios2/config.mk +0 -2
@@ -4,8 +4,6 @@ # Psyent Corporation <www.psyent.com> # Scott McNutt <[email protected]> -CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000 - PLATFORM_CPPFLAGS += -D__NIOS2__ PLATFORM_CPPFLAGS += -G0
arch/powerpc/config.mk +0 -1
@@ -3,7 +3,6 @@ # (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, [email protected]. -CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000 LDFLAGS_FINAL += --gc-sections LDFLAGS_FINAL += --bss-plt PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections \
arch/riscv/config.mk +0 -2
@@ -23,8 +23,6 @@ KBUILD_LDFLAGS += -m $(64bit-emul) EFI_LDS := elf_riscv64_efi.lds endif -CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 - PLATFORM_CPPFLAGS += -ffixed-gp -fpic PLATFORM_RELFLAGS += -fno-common -gdwarf-2 -ffunction-sections \ -fdata-sections
arch/sh/config.mk +0 -1
@@ -3,7 +3,6 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, [email protected]. -CONFIG_STANDALONE_LOAD_ADDR ?= 0x8C000000 ifeq ($(CPU),sh2) LDFLAGS_STANDALONE += -EB endif
arch/x86/config.mk +0 -2
@@ -3,8 +3,6 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, [email protected]. -CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000 - PLATFORM_CPPFLAGS += -fomit-frame-pointer PF_CPPFLAGS_X86 := $(call cc-option, -fno-toplevel-reorder, \ $(call cc-option, -fno-unit-at-a-time))
configs/display5_defconfig +1 -0
@@ -30,6 +30,7 @@ CONFIG_ENV_OFFSET_REDUND=0x130000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SYS_MONITOR_LEN=409600 +CONFIG_STANDALONE_LOAD_ADDR=0x10001000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y # CONFIG_USE_SPL_FIT_GENERATOR is not set
configs/display5_factory_defconfig +1 -0
@@ -27,6 +27,7 @@ CONFIG_ENV_OFFSET_REDUND=0x130000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SYS_MONITOR_LEN=409600 +CONFIG_STANDALONE_LOAD_ADDR=0x10001000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y # CONFIG_USE_SPL_FIT_GENERATOR is not set
configs/microchip_mpfs_icicle_defconfig +1 -0
@@ -12,6 +12,7 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 +CONFIG_STANDALONE_LOAD_ADDR=0x80200000 CONFIG_FIT=y CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y
configs/qemu-riscv32_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_SYS_MONITOR_LEN=786432 +CONFIG_STANDALONE_LOAD_ADDR=0x80200000 CONFIG_FIT=y CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y
configs/qemu-riscv32_smode_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_SYS_MONITOR_LEN=786432 +CONFIG_STANDALONE_LOAD_ADDR=0x80200000 CONFIG_FIT=y CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y
configs/qemu-riscv32_spl_defconfig +1 -0
@@ -12,6 +12,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_SYS_MONITOR_LEN=786432 +CONFIG_STANDALONE_LOAD_ADDR=0x80200000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000 CONFIG_DISPLAY_CPUINFO=y
configs/qemu-riscv64_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_ARCH_RV64I=y CONFIG_DISTRO_DEFAULTS=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 +CONFIG_STANDALONE_LOAD_ADDR=0x80200000 CONFIG_FIT=y CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y
configs/qemu-riscv64_smode_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 +CONFIG_STANDALONE_LOAD_ADDR=0x80200000 CONFIG_FIT=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};"
configs/qemu-riscv64_spl_defconfig +1 -0
@@ -11,6 +11,7 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 +CONFIG_STANDALONE_LOAD_ADDR=0x80200000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000 CONFIG_DISPLAY_CPUINFO=y
configs/sifive_unleashed_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 +CONFIG_STANDALONE_LOAD_ADDR=0x80200000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000 CONFIG_USE_PREBOOT=y
configs/sifive_unmatched_defconfig +1 -0
@@ -19,6 +19,7 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 +CONFIG_STANDALONE_LOAD_ADDR=0x80200000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000 CONFIG_USE_PREBOOT=y
configs/xtfpga_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_SYS_LOAD_ADDR=0x02000000 CONFIG_ENV_ADDR=0xF7FE0000 CONFIG_XTFPGA_KC705=y CONFIG_SYS_MONITOR_LEN=262144 +CONFIG_STANDALONE_LOAD_ADDR=0x00800000 CONFIG_SYS_MONITOR_BASE=0xF6000000 CONFIG_DYNAMIC_SYS_CLK_FREQ=y CONFIG_SHOW_BOOT_PROGRESS=y
include/configs/display5.h +0 -2
@@ -276,8 +276,6 @@/* Miscellaneous configurable options */ -#define CONFIG_STANDALONE_LOAD_ADDR 0x10001000 -/* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR#define CFG_SYS_SDRAM_BASE PHYS_SDRAM
include/configs/microchip_mpfs_icicle.h +0 -2
@@ -11,8 +11,6 @@#define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 -/* Environment options */ #define BOOT_TARGET_DEVICES (func) \
include/configs/opos6uldev.h +0 -1
@@ -11,7 +11,6 @@#include "mx6_common.h" /* Miscellaneous configurable options */ -#define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR/* Physical Memory Map */ #define CFG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR
include/configs/qemu-riscv.h +0 -2
@@ -10,8 +10,6 @@#define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 -#define RISCV_MMODE_TIMERBASE 0x2000000#define RISCV_MMODE_TIMER_FREQ 1000000
include/configs/sifive-unleashed.h +0 -2
@@ -13,8 +13,6 @@#define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 -#define RISCV_MMODE_TIMERBASE 0x2000000#define RISCV_MMODE_TIMER_FREQ 1000000
include/configs/sifive-unmatched.h +0 -2
@@ -13,8 +13,6 @@#define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 -/* Environment options */ #define BOOT_TARGET_DEVICES (func) \
include/configs/sunxi-common.h +0 -3
@@ -73,9 +73,6 @@* Miscellaneous configurable options */ -/* standalone support */ -#define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR -/* FLASH and environment organization */ /*
include/configs/xtfpga.h +0 -16
@@ -53,22 +53,6 @@/* Memory test is destructive so default must not overlap vectors or U-Boot*/ -/* Load address for stand-alone applications. -* MEMADDR cannot be used here, because the definition needs to be -* a plain number as it's used as -Ttext argument for ld in standalone -* example makefile. -* Handle noMMU vs MMUv2 vs MMUv3 distinction here manually. -*/ -#if XCHAL_HAVE_PTP_MMU -#if XCHAL_VECBASE_RESET_VADDR ==XCHAL_VECBASE_RESET_PADDR -#define CONFIG_STANDALONE_LOAD_ADDR 0x00800000 -#else -#define CONFIG_STANDALONE_LOAD_ADDR 0xd0800000 -#endif -#else -#define CONFIG_STANDALONE_LOAD_ADDR 0x60800000 -#endif -#if defined(CONFIG_MAX_MEM_MAPPED ) && \CONFIG_MAX_MEM_MAPPED <CFG_SYS_SDRAM_SIZE #define XTENSA_SYS_TEXT_ADDR \
Signature · 1 line
2.25.1
PATCH 35/41 Convert CONFIG_TEGRA_ENABLE_UARTA et al to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_TEGRA_ENABLE_UARTA
CONFIG_TEGRA_ENABLE_UARTB
CONFIG_TEGRA_ENABLE_UARTC
CONFIG_TEGRA_ENABLE_UARTD
CONFIG_TEGRA_SPI
CONFIG_TEGRA_UARTA_GPU
CONFIG_TEGRA_UARTA_SDIO1
CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
--- arch/arm/mach-tegra/Kconfig | 23 +++++++++++++++++++++++ arch/arm/mach-tegra/tegra20/Kconfig | 8 ++++++++ arch/arm/mach-tegra/tegra30/Kconfig | 8 ++++++++ configs/cei-tk1-som_defconfig | 1 + configs/dalmore_defconfig | 1 + configs/harmony_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/medcom-wide_defconfig | 1 + configs/plutux_defconfig | 1 + configs/seaboard_defconfig | 1 + configs/tec-ng_defconfig | 1 + configs/tec_defconfig | 1 + configs/ventana_defconfig | 1 + include/configs/apalis-tk1.h | 1 - include/configs/apalis_t30.h | 1 - include/configs/beaver.h | 4 ---- include/configs/cardhu.h | 4 ---- include/configs/cei-tk1-som.h | 1 - include/configs/colibri_t20.h | 2 -- include/configs/colibri_t30.h | 1 - include/configs/dalmore.h | 1 - include/configs/harmony.h | 1 - include/configs/jetson-tk1.h | 1 - include/configs/medcom-wide.h | 1 - include/configs/nyan-big.h | 1 - include/configs/p2371-0000.h | 1 - include/configs/p2371-2180.h | 1 - include/configs/p2571.h | 1 - include/configs/p3450-0000.h | 1 - include/configs/paz00.h | 1 - include/configs/plutux.h | 1 - include/configs/seaboard.h | 1 - include/configs/tec-ng.h | 1 - include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 4 ---- include/configs/trimslice.h | 2 -- include/configs/venice2.h | 1 - include/configs/ventana.h | 1 - 38 files changed, 49 insertions(+), 36 deletions(-)
arch/arm/mach-tegra/Kconfig +23 -0
@@ -177,6 +177,29 @@ source "arch/arm/mach-tegra/tegra124/Kconfig" source "arch/arm/mach-tegra/tegra210/Kconfig" source "arch/arm/mach-tegra/tegra186/Kconfig" +config TEGRA_SPI + def_bool y + depends on TEGRA20_SFLASH || TEGRA20_SLINK || TEGRA114_SPI + +choice + prompt "UART to use for console" + depends on TEGRA_PINCTRL + default TEGRA_ENABLE_UARTA + +config TEGRA_ENABLE_UARTA + bool "Use UARTA" + +config TEGRA_ENABLE_UARTB + bool "Use UARTB" + +config TEGRA_ENABLE_UARTC + bool "Use UARTC" + +config TEGRA_ENABLE_UARTD + bool "Use UARTD" + +endchoice + config TEGRA_GPU bool "Enable setting up the GPU" depends on TEGRA124 || TEGRA210
arch/arm/mach-tegra/tegra20/Kconfig +8 -0
@@ -10,6 +10,12 @@ config TEGRA_PMU config TEGRA_CLOCK_SCALING bool +config TEGRA_UARTA_GPU + bool + +config TEGRA_UARTA_SDIO1 + bool + choice prompt "Tegra20 board select" optional
@@ -43,6 +49,7 @@ config TARGET_TEC config TARGET_TRIMSLICE bool "Compulab TrimSlice board" select BOARD_LATE_INIT + select TEGRA_UARTA_GPU config TARGET_VENTANA bool "NVIDIA Tegra20 Ventana evaluation board"
@@ -51,6 +58,7 @@ config TARGET_VENTANA config TARGET_COLIBRI_T20 bool "Toradex Colibri T20 board" select BOARD_LATE_INIT + select TEGRA_UARTA_SDIO1 endchoice
arch/arm/mach-tegra/tegra30/Kconfig +8 -0
@@ -1,5 +1,11 @@ if TEGRA30 +config TEGRA_VDD_CORE_TPS62361B_SET3 + bool + +config TEGRA_VDD_CORE_TPS62366A_SET1 + bool + choice prompt "Tegra30 board select" optional
@@ -11,10 +17,12 @@ config TARGET_APALIS_T30 config TARGET_BEAVER bool "NVIDIA Tegra30 Beaver evaluation board" select BOARD_LATE_INIT + select TEGRA_VDD_CORE_TPS62366A_SET1 config TARGET_CARDHU bool "NVIDIA Tegra30 Cardhu evaluation board" select BOARD_LATE_INIT + select TEGRA_VDD_CORE_TPS62361B_SET3 config TARGET_COLIBRI_T30 bool "Toradex Colibri T30 board"
configs/cei-tk1-som_defconfig +1 -0
@@ -12,6 +12,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SYS_PROMPT="Tegra124 (TK1-SOM) # " CONFIG_TEGRA124=y CONFIG_TARGET_CEI_TK1_SOM=y +CONFIG_TEGRA_ENABLE_UARTD=y CONFIG_TEGRA_GPU=y CONFIG_ARMV7_PSCI_0_1=y CONFIG_SYS_LOAD_ADDR=0x81000000
configs/dalmore_defconfig +1 -0
@@ -11,6 +11,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SYS_PROMPT="Tegra114 (Dalmore) # " CONFIG_TEGRA114=y CONFIG_TARGET_DALMORE=y +CONFIG_TEGRA_ENABLE_UARTD=y CONFIG_SYS_LOAD_ADDR=0x81000000 CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y
configs/harmony_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x00108000 CONFIG_SYS_PROMPT="Tegra20 (Harmony) # " CONFIG_TEGRA20=y CONFIG_TARGET_HARMONY=y +CONFIG_TEGRA_ENABLE_UARTD=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_OF_SYSTEM_SETUP=y CONFIG_SYS_STDIO_DEREGISTER=y
configs/jetson-tk1_defconfig +1 -0
@@ -12,6 +12,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SYS_PROMPT="Tegra124 (Jetson TK1) # " CONFIG_TEGRA124=y CONFIG_TARGET_JETSON_TK1=y +CONFIG_TEGRA_ENABLE_UARTD=y CONFIG_TEGRA_GPU=y CONFIG_SYS_LOAD_ADDR=0x81000000 CONFIG_OF_SYSTEM_SETUP=y
configs/medcom-wide_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x00108000 CONFIG_SYS_PROMPT="Tegra20 (Medcom-Wide) # " CONFIG_TEGRA20=y CONFIG_TARGET_MEDCOM_WIDE=y +CONFIG_TEGRA_ENABLE_UARTD=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_FIT=y CONFIG_OF_SYSTEM_SETUP=y
configs/plutux_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x00108000 CONFIG_SYS_PROMPT="Tegra20 (Plutux) # " CONFIG_TEGRA20=y CONFIG_TARGET_PLUTUX=y +CONFIG_TEGRA_ENABLE_UARTD=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_FIT=y CONFIG_OF_SYSTEM_SETUP=y
configs/seaboard_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x00108000 CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # " CONFIG_TEGRA20=y CONFIG_TARGET_SEABOARD=y +CONFIG_TEGRA_ENABLE_UARTD=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_OF_SYSTEM_SETUP=y CONFIG_USE_PREBOOT=y
configs/tec-ng_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SYS_PROMPT="Tegra30 (TEC-NG) # " CONFIG_TEGRA30=y CONFIG_TARGET_TEC_NG=y +CONFIG_TEGRA_ENABLE_UARTD=y CONFIG_SYS_LOAD_ADDR=0x81000000 CONFIG_FIT=y CONFIG_OF_SYSTEM_SETUP=y
configs/tec_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x00108000 CONFIG_SYS_PROMPT="Tegra20 (TEC) # " CONFIG_TEGRA20=y CONFIG_TARGET_TEC=y +CONFIG_TEGRA_ENABLE_UARTD=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_FIT=y CONFIG_OF_SYSTEM_SETUP=y
configs/ventana_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x00108000 CONFIG_SYS_PROMPT="Tegra20 (Ventana) # " CONFIG_TEGRA20=y CONFIG_TARGET_VENTANA=y +CONFIG_TEGRA_ENABLE_UARTD=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_OF_SYSTEM_SETUP=y CONFIG_USE_PREBOOT=y
include/configs/apalis-tk1.h +0 -1
@@ -13,7 +13,6 @@#include "tegra124-common.h" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE#define FDT_MODULE "apalis-v1.2"
include/configs/apalis_t30.h +0 -1
@@ -20,7 +20,6 @@* Apalis UART3: NVIDIA UARTB * Apalis UART4: NVIDIA UARTC */ -#define CONFIG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE#define UBOOT_UPDATE \
include/configs/beaver.h +0 -4
@@ -10,14 +10,10 @@#include "tegra30-common.h" -/* VDD core PMIC */ -#define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 -/* High-level configuration options */ #define CONFIG_TEGRA_BOARD_STRING "NVIDIA Beaver"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE#include "tegra-common-post.h"
include/configs/cardhu.h +0 -4
@@ -10,9 +10,6 @@#include "tegra30-common.h" -/* VDD core PMIC */ -#define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 -/* High-level configuration options */ #define CONFIG_TEGRA_BOARD_STRING "NVIDIA Cardhu"
@@ -21,7 +18,6 @@"fdtfile=tegra30-cardhu-a04.dtb\0" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE#include "tegra-common-post.h"
include/configs/cei-tk1-som.h +0 -1
@@ -19,7 +19,6 @@#define CONFIG_TEGRA_BOARD_STRING "CEI tk1-som"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE#include "tegra-common-post.h"
include/configs/colibri_t20.h +0 -2
@@ -11,8 +11,6 @@#include "tegra20-common.h" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA -#define CONFIG_TEGRA_UARTA_SDIO1 #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* NAND support */
include/configs/colibri_t30.h +0 -1
@@ -21,7 +21,6 @@* Colibri UART-B: NVIDIA UARTD * Colibri UART-C: NVIDIA UARTB */ -#define CONFIG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE#define UBOOT_UPDATE \
include/configs/dalmore.h +0 -1
@@ -14,7 +14,6 @@#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Dalmore"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* Environment in eMMC, at the end of 2nd "boot sector" */
include/configs/harmony.h +0 -1
@@ -14,7 +14,6 @@#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Harmony"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: keyboard satellite board UART, default */ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
include/configs/jetson-tk1.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE#include "tegra-common-post.h"
include/configs/medcom-wide.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* NAND support */
include/configs/nyan-big.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE#include "tegra-common-post.h"
include/configs/p2371-0000.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2371-0000"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */
include/configs/p2371-2180.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2371-2180"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */
include/configs/p2571.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2571"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */
include/configs/p3450-0000.h +0 -1
@@ -14,7 +14,6 @@#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P3450-0000"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA /* Only MMC/PXE/DHCP for now, add USB back in later when supported */ #define BOOT_TARGET_DEVICES (func) \
include/configs/paz00.h +0 -1
@@ -16,7 +16,6 @@#define CONFIG_TEGRA_BOARD_STRING "Compal Paz00"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* Environment in eMMC, at the end of 2nd "boot sector" */
include/configs/plutux.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Plutux"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* NAND support */
include/configs/seaboard.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Seaboard"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* Environment in eMMC, at the end of 2nd "boot sector" */
include/configs/tec-ng.h +0 -1
@@ -13,7 +13,6 @@#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE#include "tegra-common-post.h"
include/configs/tec.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* NAND support */
include/configs/tegra-common-post.h +0 -4
@@ -73,8 +73,4 @@BOOTENV \ BOARD_EXTRA_ENV_SETTINGS -#if defined(CONFIG_TEGRA20_SFLASH ) || defined(CONFIG_TEGRA20_SLINK ) || defined(CONFIG_TEGRA114_SPI ) -#define CONFIG_TEGRA_SPI -#endif -#endif /* __TEGRA_COMMON_POST_H */
include/configs/trimslice.h +0 -2
@@ -14,8 +14,6 @@#define CONFIG_TEGRA_BOARD_STRING "Compulab Trimslice"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA -#define CONFIG_TEGRA_UARTA_GPU #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* SPI */
include/configs/venice2.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Venice2"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* Environment in eMMC, at the end of 2nd "boot sector" */
include/configs/ventana.h +0 -1
@@ -14,7 +14,6 @@#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Ventana"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* Environment in eMMC, at the end of 2nd "boot sector" */
Signature · 1 line
2.25.1
PATCH 36/41 Convert CONFIG_THOR_RESET_OFF to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_THOR_RESET_OFF
--- cmd/Kconfig | 4 ++++ configs/topic_miami_defconfig | 1 + configs/topic_miamilite_defconfig | 1 + configs/topic_miamiplus_defconfig | 1 + configs/xilinx_zynq_virt_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 1 + include/configs/xilinx_versal.h | 1 - include/configs/xilinx_versal_net.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h | 1 - 10 files changed, 9 insertions(+), 4 deletions(-)
cmd/Kconfig +4 -0
@@ -526,6 +526,10 @@ config CMD_THOR_DOWNLOAD There is no documentation about this within the U-Boot source code but you should be able to find something on the interwebs. +config THOR_RESET_OFF + bool "thor: Disable reset on completion" + depends on CMD_THOR_DOWNLOAD + config CMD_ZBOOT bool "zboot - x86 boot command" help
configs/topic_miami_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=2077 CONFIG_SYS_BOOTM_LEN=0x3c00000 CONFIG_CMD_THOR_DOWNLOAD=y +CONFIG_THOR_RESET_OFF=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_DFU=y CONFIG_CMD_I2C=y
configs/topic_miamilite_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=2077 CONFIG_SYS_BOOTM_LEN=0x3c00000 CONFIG_CMD_THOR_DOWNLOAD=y +CONFIG_THOR_RESET_OFF=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_DFU=y CONFIG_CMD_I2C=y
configs/topic_miamiplus_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=2077 CONFIG_SYS_BOOTM_LEN=0x3c00000 CONFIG_CMD_THOR_DOWNLOAD=y +CONFIG_THOR_RESET_OFF=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_DFU=y CONFIG_CMD_I2C=y
configs/xilinx_zynq_virt_defconfig +1 -0
@@ -51,6 +51,7 @@ CONFIG_SYS_PBSIZE=2071 CONFIG_SYS_BOOTM_LEN=0x3c00000 CONFIG_CMD_IMLS=y CONFIG_CMD_THOR_DOWNLOAD=y +CONFIG_THOR_RESET_OFF=y CONFIG_CMD_GREPENV=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y
configs/xilinx_zynqmp_virt_defconfig +1 -0
@@ -57,6 +57,7 @@ CONFIG_SYS_PBSIZE=2073 CONFIG_SYS_BOOTM_LEN=0x6400000 CONFIG_CMD_BOOTMENU=y CONFIG_CMD_THOR_DOWNLOAD=y +CONFIG_THOR_RESET_OFF=y CONFIG_CMD_GREPENV=y CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_MEMTEST=y
include/configs/xilinx_versal.h +0 -1
@@ -25,7 +25,6 @@#if defined(CONFIG_CMD_DFU )#define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_THOR_RESET_OFF #endif /* Ethernet driver */
include/configs/xilinx_versal_net.h +0 -1
@@ -25,7 +25,6 @@#if defined(CONFIG_CMD_DFU )#define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_THOR_RESET_OFF #define DFU_ALT_INFO_RAM \ "dfu_ram_info=" \ "setenv dfu_alt_info " \
include/configs/xilinx_zynqmp.h +0 -1
@@ -31,7 +31,6 @@#if defined(CONFIG_ZYNQMP_USB )#define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_THOR_RESET_OFF # define PARTS_DEFAULT \ "partitions=uuid_disk=${uuid_gpt_disk};" \
include/configs/zynq-common.h +0 -1
@@ -38,7 +38,6 @@#ifdef CONFIG_USB_EHCI_ZYNQ # define DFU_DEFAULT_POLL_TIMEOUT 300 -# define CONFIG_THOR_RESET_OFF #endif /* enable preboot to be loaded before CONFIG_BOOTDELAY */
Signature · 1 line
2.25.1
PATCH 37/41 net: Remove more legacy functions
In reply to Tom RiniRemove some of the board and arch specific non-DM_ETH helper code.
--- arch/arm/cpu/armv7/ls102xa/cpu.c | 9 --------- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 3 --- arch/powerpc/cpu/mpc83xx/cpu.c | 18 ----------------- arch/powerpc/cpu/mpc8xxx/cpu.c | 26 ------------------------- drivers/net/qe/uec.h | 1 - include/configs/km/km-mpc83xx.h | 5 ----- include/fm_eth.h | 1 - include/netdev.h | 1 - 8 files changed, 64 deletions(-)
arch/arm/cpu/armv7/ls102xa/cpu.c +0 -9
@@ -302,15 +302,6 @@ int cpu_mmc_init(struct bd_info *bis) }#endif -int cpu_eth_init (struct bd_info *bis) -{ -#if defined(CONFIG_TSEC_ENET ) && !defined(CONFIG_DM_ETH ) -tsec_standard_init (bis); -#endif - -return 0 ; -} -int arch_cpu_init (void ) {void *epu_base = (void *)(CFG_SYS_DCSRBAR +EPU_BLOCK_OFFSET );
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +0 -3
@@ -1057,9 +1057,6 @@ int cpu_eth_init(struct bd_info *bis)#if defined(CONFIG_FSL_MC_ENET ) && !defined(CONFIG_SPL_BUILD ) error =fsl_mc_ldpaa_init (bis); -#endif -#ifdef CONFIG_FMAN_ENET -fm_standard_init (bis);#endif return error; }
arch/powerpc/cpu/mpc83xx/cpu.c +0 -18
@@ -180,24 +180,6 @@ void watchdog_reset (void) }#endif -#ifndef CONFIG_DM_ETH -/* -* Initializes on-chip ethernet controllers. -* to override, implement board_eth_init() -*/ -int cpu_eth_init (struct bd_info *bis) -{ -#if defined(CONFIG_UEC_ETH ) -uec_standard_init (bis); -#endif - -#if defined(CONFIG_TSEC_ENET ) -tsec_standard_init (bis); -#endif -return 0 ; -} -#endif /* !CONFIG_DM_ETH */ -/* * Initializes on-chip MMC controllers. * to override, implement board_mmc_init()
arch/powerpc/cpu/mpc8xxx/cpu.c +0 -26
@@ -343,29 +343,3 @@ int fixup_cpu(void)#endif return 0 ; } - -#ifndef CONFIG_DM_ETH -/* -* Initializes on-chip ethernet controllers. -* to override, implement board_eth_init() -*/ -int cpu_eth_init (struct bd_info *bis) -{ -#if defined(CONFIG_UEC_ETH ) -uec_standard_init (bis); -#endif - -#if defined(CONFIG_TSEC_ENET ) || defined(CONFIG_MPC85XX_FEC ) -tsec_standard_init (bis); -#endif - -#ifdef CONFIG_FMAN_ENET -fm_standard_init (bis); -#endif - -#ifdef CONFIG_VSC9953 -vsc9953_init (bis); -#endif -return 0 ; -} -#endif
drivers/net/qe/uec.h +0 -1
@@ -689,5 +689,4 @@ struct uec_priv {int uec_initialize (struct bd_info *bis,struct uec_inf *uec_info);int uec_eth_init (struct bd_info *bis,struct uec_inf *uecs,int num); -int uec_standard_init (struct bd_info *bis);#endif /* __UEC_H__ */
include/configs/km/km-mpc83xx.h +0 -5
@@ -90,8 +90,3 @@ "era " __stringify(CONFIG_ENV_ADDR) " +0x40000\0" \"unlock=yes\0" \"" - -/* -* QE UEC ethernet configuration -*/ -#define CONFIG_UEC_ETH
include/fm_eth.h +0 -1
@@ -202,7 +202,6 @@ struct memac_mdio_info {int fm_tgec_mdio_init (struct bd_info *bis,struct tgec_mdio_info *info);int fm_memac_mdio_init (struct bd_info *bis,struct memac_mdio_info *info); -int fm_standard_init (struct bd_info *bis);void fman_enet_init (void );void fdt_fixup_fman_ethernet (void *fdt);phy_interface_t fm_info_get_enet_if (enum fm_port port);
include/netdev.h +0 -1
@@ -70,7 +70,6 @@ int sh_eth_initialize(struct bd_info *bis);int skge_initialize (struct bd_info *bis);int smc91111_initialize (u8 dev_num,phys_addr_t base_addr);int smc911x_initialize (u8 dev_num,phys_addr_t base_addr); -int uec_standard_init (struct bd_info *bis);int uli526x_initialize (struct bd_info *bis);int armada100_fec_register (unsigned long base_addr);
Signature · 1 line
2.25.1
PATCH 38/41 net: vsc9953: Remove this driver
In reply to Tom RiniNo platforms enable this driver as there's no T1040D4RDB nor T1040RDB support at this time. Remove.
--- board/freescale/t104xrdb/eth.c | 46 - drivers/net/Kconfig | 3 - drivers/net/Makefile | 1 - drivers/net/vsc9953.c | 2754 -------------------------------- 4 files changed, 2804 deletions(-) delete mode 100644 drivers/net/vsc9953.c
board/freescale/t104xrdb/eth.c +0 -46
@@ -22,10 +22,6 @@ int board_eth_init(struct bd_info *bis)struct memac_mdio_info memac_mdio_info;unsigned int i;int phy_addr =0 ; -#ifdef CONFIG_VSC9953 -phy_interface_t phy_int; -struct mii_dev *bus; -#endif printf ("Initializing Fman\n" );
@@ -107,48 +103,6 @@ int board_eth_init(struct bd_info *bis) DEFAULT_FM_MDIO_NAME)); } -#ifdef CONFIG_VSC9953 -/* SerDes configured for QSGMII */ -if (serdes_get_first_lane (FSL_SRDS_1 ,QSGMII_SW1_A ) >=0 ) { -for (i =0 ; i <4 ; i++) { - bus =miiphy_get_dev_by_name (DEFAULT_FM_MDIO_NAME ); - phy_addr =CFG_SYS_FM1_QSGMII11_PHY_ADDR + i; - phy_int =PHY_INTERFACE_MODE_QSGMII ; - -vsc9953_port_info_set_mdio (i, bus); -vsc9953_port_info_set_phy_address (i, phy_addr); -vsc9953_port_info_set_phy_int (i, phy_int); -vsc9953_port_enable (i); - } - } -if (serdes_get_first_lane (FSL_SRDS_1 ,QSGMII_SW1_B ) >=0 ) { -for (i =4 ; i <8 ; i++) { - bus =miiphy_get_dev_by_name (DEFAULT_FM_MDIO_NAME ); - phy_addr =CFG_SYS_FM1_QSGMII21_PHY_ADDR + i -4 ; - phy_int =PHY_INTERFACE_MODE_QSGMII ; - -vsc9953_port_info_set_mdio (i, bus); -vsc9953_port_info_set_phy_address (i, phy_addr); -vsc9953_port_info_set_phy_int (i, phy_int); -vsc9953_port_enable (i); - } - } - -/* Connect DTSEC1 to L2 switch if it doesn't have a PHY */ -if (serdes_get_first_lane (FSL_SRDS_1 ,SGMII_FM1_DTSEC1 ) <0 ) -vsc9953_port_enable (8 ); - -/* Connect DTSEC2 to L2 switch if it doesn't have a PHY */ -if (serdes_get_first_lane (FSL_SRDS_1 ,SGMII_FM1_DTSEC2 ) <0 ) { -/* Enable L2 On MAC2 using SCFG */ -struct ccsr_scfg *scfg = (struct ccsr_scfg *) - CFG_SYS_MPC85xx_SCFG; - -out_be32 (&scfg->esgmiiselcr,in_be32 (&scfg->esgmiiselcr) | - (0x80000000 )); -vsc9953_port_enable (9 ); - } -#endif cpu_eth_init (bis);#endif
drivers/net/Kconfig +0 -3
@@ -709,9 +709,6 @@ config XILINX_AXIMRMAC config VSC7385_ENET bool "Vitesse 7385 Switch Firmware Upload driver" -config VSC9953 - bool "Vitesse VSC9953 L2 Switch driver" - config XILINX_EMACLITE select PHYLIB select MII
drivers/net/Makefile +0 -1
@@ -87,7 +87,6 @@ obj-$(CONFIG_SUN8I_EMAC) += sun8i_emac.o obj-$(CONFIG_TSEC_ENET) += tsec.o fsl_mdio.o obj-$(CONFIG_TULIP) += dc2114x.o obj-$(CONFIG_VSC7385_ENET) += vsc7385.o -obj-$(CONFIG_VSC9953) += vsc9953.o obj-$(CONFIG_XILINX_AXIEMAC) += xilinx_axi_emac.o obj-$(CONFIG_XILINX_AXIMRMAC) += xilinx_axi_mrmac.o obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
drivers/net/vsc9953.c deleted +0 -2754
2,754 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 39/41 usb: Remove CONFIG_USBD_HS
In reply to Tom RiniThis define is not enabled by the only platform which currently enables the legacy option of CONFIG_USB_DEVICE. We can drop this code.
--- README | 8 ----- drivers/serial/usbtty.c | 50 -------------------------- drivers/serial/usbtty.h | 4 --- drivers/usb/gadget/ep0.c | 19 ---------- include/configs/apalis_imx6.h | 2 -- include/configs/colibri-imx6ull.h | 2 -- include/configs/colibri_imx6.h | 2 -- include/configs/colibri_imx7.h | 2 -- include/configs/ge_b1x5v2.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/imx7-cm.h | 2 -- include/configs/librem5.h | 2 -- include/configs/mx6sabre_common.h | 2 -- include/configs/mx7dsabresd.h | 2 -- include/configs/nitrogen6x.h | 2 -- include/configs/novena.h | 2 -- include/configs/pico-imx6ul.h | 2 -- include/configs/siemens-am33x-common.h | 3 -- include/configs/tbs2910.h | 3 -- include/configs/warp7.h | 2 -- include/usbdescriptors.h | 15 -------- include/usbdevice.h | 19 ---------- 22 files changed, 147 deletions(-)
README +0 -8
@@ -618,14 +618,6 @@ The following options need to be configured: variable usbtty to be cdc_acm should suffice. The following might be defined in YourBoardName.h - CONFIG_USBD_HS - Define this to enable the high speed support for usb - device and usbtty. If this feature is enabled, a routine - int is_usbd_high_speed(void) - also needs to be defined by the driver to dynamically poll - whether the enumeration has succeded at high speed or full - speed. - If you have a USB-IF assigned VendorID then you may wish to define your own vendor specific values either in BoardName.h or directly in usbd_vendor_info.h. If you don't define
drivers/serial/usbtty.c +0 -50
86 lines not on this page · raw message
drivers/serial/usbtty.h +0 -4
@@ -51,10 +51,6 @@#define CONFIG_USBD_SERIAL_INT_PKTSIZE UDC_INT_PACKET_SIZE#define CONFIG_USBD_SERIAL_BULK_PKTSIZE UDC_BULK_PACKET_SIZE -#if defined(CONFIG_USBD_HS ) -#define CONFIG_USBD_SERIAL_BULK_HS_PKTSIZE UDC_BULK_HS_PACKET_SIZE -#endif -#define USBTTY_DEVICE_CLASS COMMUNICATIONS_DEVICE_CLASS#define USBTTY_BCD_DEVICE 0x00
drivers/usb/gadget/ep0.c +0 -19
@@ -371,26 +371,7 @@ static int ep0_get_descriptor (struct usb_device_instance *device, }break ;case USB_DESCRIPTOR_TYPE_DEVICE_QUALIFIER : -#if defined(CONFIG_USBD_HS ) - { -struct usb_qualifier_descriptor *qualifier_descriptor = - device->qualifier_descriptor; - -if (!qualifier_descriptor) -return -1 ; - -/* copy descriptor for this device */ -copy_config (urb, qualifier_descriptor, -sizeof (struct usb_qualifier_descriptor ), - max); - - } -dbg_ep0 (3 ,"copied qualifier descriptor, actual_length: 0x%x" , - urb->actual_length); -#else return -1 ; -#endif -break ;default :return -1 ;
include/configs/apalis_imx6.h +0 -2
@@ -28,8 +28,6 @@/* Host */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -/* Client */ -#define CONFIG_USBD_HS /* Framebuffer and LCD */
include/configs/colibri-imx6ull.h +0 -2
@@ -126,8 +126,6 @@#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USBD_HS -/* USB Device Firmware Update support */ #define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/colibri_imx6.h +0 -2
@@ -25,8 +25,6 @@/* Host */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -/* Client */ -#define CONFIG_USBD_HS /* Command definition */
include/configs/colibri_imx7.h +0 -2
@@ -170,6 +170,4 @@#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USBD_HS -#endif
include/configs/ge_b1x5v2.h +0 -1
@@ -26,7 +26,6 @@/* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USBD_HS /* Memory */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
include/configs/gw_ventana.h +0 -1
@@ -38,7 +38,6 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USBD_HS /* Miscellaneous configurable options */
include/configs/imx7-cm.h +0 -2
@@ -81,6 +81,4 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_USBD_HS -#endif /* __CONFIG_H */
include/configs/librem5.h +0 -2
@@ -27,8 +27,6 @@#define CFG_SYS_FSL_USDHC_NUM 2 -#define CONFIG_USBD_HS -#define CONSOLE_ON_UART1 #ifdef CONSOLE_ON_UART1
include/configs/mx6sabre_common.h +0 -2
@@ -145,6 +145,4 @@/* Environment organization */ -#define CONFIG_USBD_HS -#endif /* __MX6QSABRE_COMMON_CONFIG_H */
include/configs/mx7dsabresd.h +0 -2
@@ -101,6 +101,4 @@/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_USBD_HS -#endif /* __CONFIG_H */
include/configs/nitrogen6x.h +0 -2
@@ -11,8 +11,6 @@#include "mx6_common.h" -#define CONFIG_USBD_HS -#define CONFIG_MXC_UART_BASE UART2_BASE/* MMC Configs */
include/configs/novena.h +0 -2
@@ -55,8 +55,6 @@#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -/* Gadget part */ -#define CONFIG_USBD_HS #endif /* Extra U-Boot environment. */
include/configs/pico-imx6ul.h +0 -2
@@ -26,8 +26,6 @@#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USBD_HS -#define DFU_DEFAULT_POLL_TIMEOUT 300#define CONFIG_DFU_ENV_SETTINGS \
include/configs/siemens-am33x-common.h +0 -3
@@ -70,9 +70,6 @@* we don't need to do it twice. */ -/* USB DRACO ID as default */ -#define CONFIG_USBD_HS -/* USB Device Firmware Update support */ #define DFU_MANIFEST_POLL_TIMEOUT 25000
include/configs/tbs2910.h +0 -3
@@ -28,9 +28,6 @@/* USB */ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#ifdef CONFIG_CMD_USB_MASS_STORAGE -#define CONFIG_USBD_HS -#endif /* CONFIG_CMD_USB_MASS_STORAGE */ #endif /* CONFIG_CMD_USB */ #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/warp7.h +0 -2
@@ -95,8 +95,6 @@#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_USBD_HS -/* USB Device Firmware Update support */ #define DFU_DEFAULT_POLL_TIMEOUT 300
include/usbdescriptors.h +0 -15
@@ -227,21 +227,6 @@ struct usb_device_descriptor {u8 bNumConfigurations; } __attribute__ ((packed)); -#if defined(CONFIG_USBD_HS ) -struct usb_qualifier_descriptor { -u8 bLength; -u8 bDescriptorType; - -u16 bcdUSB; -u8 bDeviceClass; -u8 bDeviceSubClass; -u8 bDeviceProtocol; -u8 bMaxPacketSize0; -u8 bNumConfigurations; -u8 breserved; -} __attribute__ ((packed)); -#endif -struct usb_string_descriptor {u8 bLength;u8 bDescriptorType;/* 0x03 */
include/usbdevice.h +0 -19
@@ -196,10 +196,6 @@ struct usb_bus_instance;#define USB_DT_INTERFACE 0x04#define USB_DT_ENDPOINT 0x05 -#if defined(CONFIG_USBD_HS ) -#define USB_DT_QUAL 0x06 -#endif -#define USB_DT_HID (USB_TYPE_CLASS | 0x01)#define USB_DT_REPORT (USB_TYPE_CLASS | 0x02)#define USB_DT_PHYSICAL (USB_TYPE_CLASS | 0x03)
@@ -279,11 +275,7 @@ struct usb_bus_instance;* USB Spec Release number */ -#if defined(CONFIG_USBD_HS ) -#define USB_BCD_VERSION 0x0200 -#else #define USB_BCD_VERSION 0x0110 -#endif /*
@@ -552,9 +544,6 @@ struct usb_device_instance {/* generic */ char *name;struct usb_device_descriptor *device_descriptor;/* per device descriptor */ -#if defined(CONFIG_USBD_HS ) -struct usb_qualifier_descriptor *qualifier_descriptor; -#endif void (*event) (struct usb_device_instance *device,usb_device_event_t event,int data);
@@ -644,14 +633,6 @@ struct usb_string_descriptor *usbd_get_string (u8);struct usb_device_descriptor *usbd_device_device_descriptor (struct usb_device_instance *,int ); -#if defined(CONFIG_USBD_HS ) -/* -* is_usbd_high_speed routine needs to be defined by specific gadget driver -* It returns true if device enumerates at High speed -* Retuns false otherwise -*/ -int is_usbd_high_speed (void ); -#endif int usbd_endpoint_halted (struct usb_device_instance *device,int endpoint);void usbd_rcv_complete (struct usb_endpoint_instance *endpoint,int len,int urb_bad);void usbd_tx_complete (struct usb_endpoint_instance *endpoint);
Signature · 1 line
2.25.1
PATCH 40/41 nxp: Rename CONFIG_U_BOOT_HDR_SIZE to FSL_U_BOOT_HDR_SIZE
In reply to Tom RiniThis is always defined to 16K, so we move this over to include/fsl_validate.h to start with. Next, we rename this from CONFIG_ to FSL_. Coalesce the various comments around this definition to be in fsl_validate.h as well to explain the usage.
--- board/freescale/common/fsl_chain_of_trust.c | 2 +- drivers/mtd/nand/raw/fsl_ifc_spl.c | 6 ++--- include/configs/T104xRDB.h | 8 +----- include/configs/ls1021atsn.h | 15 ------------ include/configs/ls1021atwr.h | 19 --------------- include/configs/ls1043a_common.h | 27 --------------------- include/configs/ls1046a_common.h | 13 ---------- include/configs/ls1088a_common.h | 13 ---------- include/fsl_validate.h | 7 ++++++ 9 files changed, 12 insertions(+), 98 deletions(-)
board/freescale/common/fsl_chain_of_trust.c +1 -1
@@ -143,7 +143,7 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) (image_entry_noargs_t )(unsigned long )spl_image->entry_point; hdr_addr = (spl_image->entry_point + spl_image->size - -CONFIG_U_BOOT_HDR_SIZE ); +FSL_U_BOOT_HDR_SIZE );spl_validate_uboot (hdr_addr, (uintptr_t )spl_image->entry_point);/* * In case of failure in validation, spl_validate_uboot would
drivers/mtd/nand/raw/fsl_ifc_spl.c +3 -3
@@ -278,11 +278,11 @@ void nand_boot(void)* U-Boot header is appended at end of U-boot image, so * calculate U-boot header address using U-boot header size. */ -#define CONFIG_U_BOOT_HDR_ADDR \ +#define FSL_U_BOOT_HDR_ADDR \ ((CFG_SYS_NAND_U_BOOT_START + \ CFG_SYS_NAND_U_BOOT_SIZE) - \ - CONFIG_U_BOOT_HDR_SIZE) -spl_validate_uboot (CONFIG_U_BOOT_HDR_ADDR , + FSL_U_BOOT_HDR_SIZE) +spl_validate_uboot (FSL_U_BOOT_HDR_ADDR ,CFG_SYS_NAND_U_BOOT_START );/* * In case of failure in validation, spl_validate_uboot would
include/configs/T104xRDB.h +1 -7
@@ -20,13 +20,7 @@#ifdef CONFIG_MTD_RAW_NAND #ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) -/* -* HDR would be appended at end of image and copied to DDR along -* with U-Boot image. -*/ -#define CFG_SYS_NAND_U_BOOT_SIZE ((768 << 10) + \ - CONFIG_U_BOOT_HDR_SIZE) +#define CFG_SYS_NAND_U_BOOT_SIZE ((768 << 10) + (16 << 10))#else #define CFG_SYS_NAND_U_BOOT_SIZE (768 << 10)#endif
include/configs/ls1021atsn.h +0 -15
@@ -38,21 +38,6 @@#define SDRAM_CFG2_FRC_SR 0x80000000#define SDRAM_CFG_BI 0x00000001 -#ifdef CONFIG_SD_BOOT -#ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) -#endif /* ifdef CONFIG_NXP_ESBC */ - -#ifdef CONFIG_U_BOOT_HDR_SIZE -/* -* HDR would be appended at end of image and copied to DDR along -* with U-Boot image. Here u-boot max. size is 512K. So if binary -* size increases then increase this size in case of secure boot as -* it uses raw U-Boot image instead of FIT image. -*/ -#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */ -#endif -#define PHYS_SDRAM 0x80000000#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
include/configs/ls1021atwr.h +0 -19
@@ -37,25 +37,6 @@#define SDRAM_CFG2_FRC_SR 0x80000000#define SDRAM_CFG_BI 0x00000001 -#ifdef CONFIG_SD_BOOT -#ifdef CONFIG_NXP_ESBC -/* -* HDR would be appended at end of image and copied to DDR along -* with U-Boot image. -*/ -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) -#endif /* ifdef CONFIG_NXP_ESBC */ - -#ifdef CONFIG_U_BOOT_HDR_SIZE -/* -* HDR would be appended at end of image and copied to DDR along -* with U-Boot image. Here u-boot max. size is 512K. So if binary -* size increases then increase this size in case of secure boot as -* it uses raw u-boot image instead of fit image. -*/ -#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */ -#endif -#define PHYS_SDRAM 0x80000000#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
include/configs/ls1043a_common.h +0 -27
@@ -41,37 +41,10 @@/* Serial Port */ #define CFG_SYS_NS16550_CLK (get_serial_clock()) -/* SD boot SPL */ -#ifdef CONFIG_SD_BOOT -#ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) -/* -* HDR would be appended at end of image and copied to DDR along -* with U-Boot image. Here u-boot max. size is 512K. So if binary -* size increases then increase this size in case of secure boot as -* it uses raw u-boot image instead of fit image. -*/ -#endif /* ifdef CONFIG_NXP_ESBC */ -#endif -/* NAND SPL */ #ifdef CONFIG_NAND_BOOT #define CFG_SYS_NAND_U_BOOT_DST CONFIG_TEXT_BASE#define CFG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE - -#ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) -#endif /* ifdef CONFIG_NXP_ESBC */ - -#ifdef CONFIG_U_BOOT_HDR_SIZE -/* -* HDR would be appended at end of image and copied to DDR along -* with U-Boot image. Here u-boot max. size is 512K. So if binary -* size increases then increase this size in case of secure boot as -* it uses raw u-boot image instead of fit image. -*/ -#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */ -#endif /* GPIO */
include/configs/ls1046a_common.h +0 -13
@@ -41,19 +41,6 @@/* Serial Port */ #define CFG_SYS_NS16550_CLK (get_serial_clock()) -/* SD boot SPL */ -#ifdef CONFIG_SD_BOOT -#ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) -/* -* HDR would be appended at end of image and copied to DDR along -* with U-Boot image. Here u-boot max. size is 512K. So if binary -* size increases then increase this size in case of secure boot as -* it uses raw u-boot image instead of fit image. -*/ -#endif /* ifdef CONFIG_NXP_ESBC */ -#endif -/* NAND SPL */ #ifdef CONFIG_NAND_BOOT #define CFG_SYS_NAND_U_BOOT_DST CONFIG_TEXT_BASE
include/configs/ls1088a_common.h +0 -13
@@ -133,17 +133,4 @@ unsigned long long get_qixis_addr(void); " 0x580e00000 \0"#endif -#ifdef CONFIG_SPL -#ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) -/* -* HDR would be appended at end of image and copied to DDR along -* with U-Boot image. Here u-boot max. size is 512K. So if binary -* size increases then increase this size in case of secure boot as -* it uses raw u-boot image instead of fit image. -*/ -#endif /* ifdef CONFIG_NXP_ESBC */ - -#endif -#endif /* __LS1088_COMMON_H */
include/fsl_validate.h +7 -0
@@ -280,4 +280,11 @@ int fsl_setenv_chain_of_trust(void);* Architecture header (appended to U-boot image). */ void spl_validate_uboot (uint32_t hdr_addr,uintptr_t img_addr); + +/* +* This header is appended at end of image and copied to DDR along +* with the U-Boot image and later used as part of the validation +* flow +*/ +#define FSL_U_BOOT_HDR_SIZE (16 << 10)#endif
Signature · 1 line
2.25.1
PATCH 41/41 T104xRDB: Remove non-TARGET_T1042D4RDB variants
In reply to Tom RiniAt this point only the TARGET_T1042D4RDB variant of this is supported in tree, so remove the remaining parts of the other platforms.
--- arch/powerpc/cpu/mpc85xx/Kconfig | 17 ------- arch/powerpc/include/asm/fsl_secure_boot.h | 2 - board/freescale/t104xrdb/Kconfig | 4 +- board/freescale/t104xrdb/cpld.h | 2 +- board/freescale/t104xrdb/eth.c | 19 -------- board/freescale/t104xrdb/t104xrdb.c | 19 +------- include/configs/T104xRDB.h | 52 ++-------------------- 7 files changed, 7 insertions(+), 108 deletions(-)
arch/powerpc/cpu/mpc85xx/Kconfig +0 -17
@@ -200,14 +200,6 @@ config TARGET_T1024RDB imply CMD_EEPROM imply PANIC_HANG -config TARGET_T1042RDB - bool "Support T1042RDB" - select ARCH_T1042 - select BOARD_LATE_INIT if CHAIN_OF_TRUST - select SUPPORT_SPL - select PHYS_64BIT - select SYS_L3_SIZE_256KB - config TARGET_T1042D4RDB bool "Support T1042D4RDB" select ARCH_T1042
@@ -217,15 +209,6 @@ config TARGET_T1042D4RDB select SYS_L3_SIZE_256KB imply PANIC_HANG -config TARGET_T1042RDB_PI - bool "Support T1042RDB_PI" - select ARCH_T1042 - select BOARD_LATE_INIT if CHAIN_OF_TRUST - select SUPPORT_SPL - select PHYS_64BIT - select SYS_L3_SIZE_256KB - imply PANIC_HANG - config TARGET_T2080QDS bool "Support T2080QDS" select ARCH_T2080
arch/powerpc/include/asm/fsl_secure_boot.h +0 -2
@@ -17,9 +17,7 @@#if defined(CONFIG_TARGET_T2080QDS ) || \ defined(CONFIG_TARGET_T2080RDB ) || \ - defined(CONFIG_TARGET_T1042RDB ) || \ defined(CONFIG_TARGET_T1042D4RDB ) || \ - defined(CONFIG_TARGET_T1042RDB_PI ) || \ defined(CONFIG_ARCH_T1024 )#undef CFG_SYS_INIT_L3_ADDR#define CFG_SYS_INIT_L3_ADDR 0xbff00000
board/freescale/t104xrdb/Kconfig +1 -3
@@ -1,6 +1,4 @@ -if TARGET_T1040RDB || TARGET_T1040D4RDB || \ - TARGET_T1042RDB || TARGET_T1042D4RDB || \ - TARGET_T1042RDB_PI +if TARGET_T1042D4RDB config SYS_BOARD default "t104xrdb"
board/freescale/t104xrdb/cpld.h +1 -1
@@ -20,7 +20,7 @@ struct cpld_data {u8 int_status;/* 0x12 - Interrupt status Register */ u8 flash_ctl_status;/* 0x13 - Flash control and status register */ u8 fan_ctl_status;/* 0x14 - Fan control and status register */ -#if defined(CONFIG_TARGET_T1040D4RDB ) || defined(CONFIG_TARGET_T1042D4RDB ) +#if defined(CONFIG_TARGET_T1042D4RDB )u8 int_mask;/* 0x15 - Interrupt mask Register */ #else u8 led_ctl_status;/* 0x15 - LED control and status register */
board/freescale/t104xrdb/eth.c +0 -19
@@ -39,25 +39,6 @@ int board_eth_init(struct bd_info *bis)int idx = i -FM1_DTSEC1 ;switch (fm_info_get_enet_if (i)) { -#if defined(CONFIG_TARGET_T1040RDB ) || defined(CONFIG_TARGET_T1040D4RDB ) -case PHY_INTERFACE_MODE_SGMII : -/* T1040RDB & T1040D4RDB only supports SGMII on -* DTSEC3 -*/ -fm_info_set_phy_address (FM1_DTSEC3 , -CFG_SYS_SGMII1_PHY_ADDR ); -break ; -#endif -#ifdef CONFIG_TARGET_T1042RDB -case PHY_INTERFACE_MODE_SGMII : -/* T1042RDB doesn't supports SGMII on DTSEC1 & DTSEC2 */ -if ((FM1_DTSEC1 == i) || (FM1_DTSEC2 == i)) -fm_info_set_phy_address (i,0 ); -/* T1042RDB only supports SGMII on DTSEC3 */ -fm_info_set_phy_address (FM1_DTSEC3 , -CFG_SYS_SGMII1_PHY_ADDR ); -break ; -#endif #ifdef CONFIG_TARGET_T1042D4RDB case PHY_INTERFACE_MODE_SGMII :/* T1042D4RDB supports SGMII on DTSEC1, DTSEC2
board/freescale/t104xrdb/t104xrdb.c +1 -18
@@ -34,7 +34,7 @@ int checkboard(void)struct cpu_type *cpu = gd->arch.cpu;u8 sw; -#if defined(CONFIG_TARGET_T1040D4RDB ) || defined(CONFIG_TARGET_T1042D4RDB ) +#if defined(CONFIG_TARGET_T1042D4RDB )printf ("Board: %sD4RDB\n" , cpu->name);#else printf ("Board: %sRDB\n" , cpu->name);
@@ -110,23 +110,6 @@ int misc_init_r(void)CPLD_WRITE (misc_ctl_status,CPLD_READ (misc_ctl_status) |MISC_CTL_SG_SEL |MISC_CTL_AURORA_SEL ); -#if defined(CONFIG_TARGET_T1040D4RDB ) -if (hwconfig ("qe-tdm" )) { -CPLD_WRITE (sfp_ctl_status,CPLD_READ (sfp_ctl_status) | -MISC_MUX_QE_TDM ); -printf ("QECSR : 0x%02x, mux to qe-tdm\n" , -CPLD_READ (sfp_ctl_status)); - } -/* Mask all CPLD interrupt sources, except QSGMII interrupts */ -if (CPLD_READ (sw_ver) <0x03 ) { -debug ("CPLD SW version 0x%02x doesn't support int_mask\n" , -CPLD_READ (sw_ver)); - }else { -CPLD_WRITE (int_mask,CPLD_INT_MASK_ALL & - ~(CPLD_INT_MASK_QSGMII1 |CPLD_INT_MASK_QSGMII2 )); - } -#endif -return 0 ; }
include/configs/T104xRDB.h +4 -48
88 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 1/149 exynos: Rework legacy PWM usage
The way that the timer support is currently done for exynos/nexell platforms relies on the legacy PWM infrastructure, and that needs to be updated. However, we really cannot safely undef CONFIG_DM_PWM to build the timer.c file without warnings. For now, rename the relevant legacy functions to be prefixed with s5p_ and add prototypes to the arch pwm.h files.
--- arch/arm/cpu/armv7/s5p-common/pwm.c | 11 +++++------ arch/arm/cpu/armv7/s5p-common/timer.c | 10 +++------- arch/arm/mach-exynos/include/mach/pwm.h | 5 +++++ arch/arm/mach-nexell/include/mach/pwm.h | 5 +++++ arch/arm/mach-s5pc1xx/include/mach/pwm.h | 5 +++++ board/friendlyarm/nanopi2/board.c | 4 ++-- board/friendlyarm/nanopi2/onewire.c | 4 ++-- 7 files changed, 27 insertions(+), 17 deletions(-)
arch/arm/cpu/armv7/s5p-common/pwm.c +5 -6
@@ -7,12 +7,11 @@#include <common.h> #include <errno.h> -#include <pwm.h> #include <asm/io.h> #include <asm/arch/pwm.h> #include <asm/arch/clk.h> -int pwm_enable (int pwm_id) +int s5p_pwm_enable (int pwm_id) { const struct s5p_timer *pwm =#if defined(CONFIG_ARCH_NEXELL )
@@ -30,7 +29,7 @@ int pwm_enable(int pwm_id)return 0 ; } -void pwm_disable (int pwm_id) +void s5p_pwm_disable (int pwm_id) { const struct s5p_timer *pwm =#if defined(CONFIG_ARCH_NEXELL )
@@ -92,7 +91,7 @@ static unsigned long pwm_calc_tin(int pwm_id, unsigned long freq)#define NS_IN_SEC 1000000000UL -int pwm_config (int pwm_id,int duty_ns,int period_ns) +int s5p_pwm_config (int pwm_id,int duty_ns,int period_ns) { const struct s5p_timer *pwm =#if defined(CONFIG_ARCH_NEXELL )
@@ -157,7 +156,7 @@ int pwm_config(int pwm_id, int duty_ns, int period_ns)return 0 ; } -int pwm_init (int pwm_id,int div,int invert) +int s5p_pwm_init (int pwm_id,int div,int invert) {u32 val; const struct s5p_timer *pwm =
@@ -219,7 +218,7 @@ int pwm_init(int pwm_id, int div, int invert) val |=TCON_INVERTER (pwm_id);writel (val, &pwm->tcon); -pwm_enable (pwm_id); +s5p_pwm_enable (pwm_id);return 0 ; }
arch/arm/cpu/armv7/s5p-common/timer.c +3 -7
@@ -16,10 +16,6 @@#include <asm/arch/clk.h> #include <linux/delay.h> -/* Use the old PWM interface for now */ -#undef CONFIG_DM_PWM -#include <pwm.h> -DECLARE_GLOBAL_DATA_PTR ;unsigned long get_current_tick (void );
@@ -49,9 +45,9 @@ static unsigned long timer_get_us_down(void)int timer_init (void ) {/* PWM Timer 4 */ -pwm_init (4 ,MUX_DIV_4 ,0 ); -pwm_config (4 ,100000 ,100000 ); -pwm_enable (4 ); +s5p_pwm_init (4 ,MUX_DIV_4 ,0 ); +s5p_pwm_config (4 ,100000 ,100000 ); +s5p_pwm_enable (4 );/* Use this as the current monotonic time in us */ gd->arch.timer_reset_value =0 ;
arch/arm/mach-exynos/include/mach/pwm.h +5 -0
@@ -49,6 +49,11 @@ struct s5p_timer {unsigned int tcnto4;unsigned int tintcstat; }; + +int s5p_pwm_init (int pwm_id,int div,int invert); +int s5p_pwm_config (int pwm_id,int duty_ns,int period_ns); +int s5p_pwm_enable (int pwm_id); +void s5p_pwm_disable (int pwm_id);#endif /* __ASSEMBLY__ */ #endif
arch/arm/mach-nexell/include/mach/pwm.h +5 -0
@@ -49,6 +49,11 @@ struct s5p_timer {unsigned int tcnto4;unsigned int tintcstat; }; + +int s5p_pwm_init (int pwm_id,int div,int invert); +int s5p_pwm_config (int pwm_id,int duty_ns,int period_ns); +int s5p_pwm_enable (int pwm_id); +void s5p_pwm_disable (int pwm_id);#endif /* __ASSEMBLY__ */ #endif
arch/arm/mach-s5pc1xx/include/mach/pwm.h +5 -0
@@ -49,6 +49,11 @@ struct s5p_timer {unsigned int tcnto4;unsigned int tintcstat; }; + +int s5p_pwm_init (int pwm_id,int div,int invert); +int s5p_pwm_config (int pwm_id,int duty_ns,int period_ns); +int s5p_pwm_enable (int pwm_id); +void s5p_pwm_disable (int pwm_id);#endif /* __ASSEMBLY__ */ #endif
board/friendlyarm/nanopi2/board.c +2 -2
@@ -80,9 +80,9 @@ static void bd_backlight_on(void)#elif defined(BACKLIGHT_CH )/* pwm backlight ON: HIGH, ON: LOW */ -pwm_init (BACKLIGHT_CH , +s5p_pwm_init (BACKLIGHT_CH ,BACKLIGHT_DIV ,BACKLIGHT_INV ); -pwm_config (BACKLIGHT_CH , +s5p_pwm_config (BACKLIGHT_CH ,TO_DUTY_NS (BACKLIGHT_DUTY ,BACKLIGHT_HZ ),TO_PERIOD_NS (BACKLIGHT_HZ ));#endif
board/friendlyarm/nanopi2/onewire.c +2 -2
@@ -9,8 +9,8 @@#include <errno.h> #include <asm/io.h> #include <asm/arch/clk.h> +#include <asm/arch/pwm.h> #include <i2c.h> -#include <pwm.h> #include <irq_func.h>
@@ -102,7 +102,7 @@ static int onewire_init_timer(void)/* range: 1080~1970 */ period_ns -=1525 ; -return pwm_config (PWM_CH , period_ns >>1 , period_ns); +return s5p_pwm_config (PWM_CH , period_ns >>1 , period_ns); }static void wait_one_tick (void )
Signature · 1 line
2.25.1
PATCH 2/149 rk32xx: Use standard TPL linker script
As of 2f41ade79e59 ("linker: Modify linker scripts to be more generic") we can use the same linker script for SPL and TPL and not have to make use of #undef tricks. Remove these last remnants.
--- arch/arm/mach-rockchip/rk3288/Kconfig | 3 --- arch/arm/mach-rockchip/u-boot-tpl.lds | 12 ------------ configs/evb-rk3229_defconfig | 1 - 3 files changed, 16 deletions(-) delete mode 100644 arch/arm/mach-rockchip/u-boot-tpl.lds
arch/arm/mach-rockchip/rk3288/Kconfig +0 -3
@@ -168,9 +168,6 @@ config SPL_LIBGENERIC_SUPPORT config SPL_SERIAL default y -config TPL_LDSCRIPT - default "arch/arm/mach-rockchip/u-boot-tpl.lds" - config TPL_STACK default 0xff718000
arch/arm/mach-rockchip/u-boot-tpl.lds deleted +0 -12
@@ -1,12 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2019 Rockchip Electronic Co.,Ltd - */ - -#undef CONFIG_SPL_TEXT_BASE -#define CONFIG_SPL_TEXT_BASE CONFIG_TPL_TEXT_BASE - -#undef CONFIG_SPL_MAX_SIZE -#define CONFIG_SPL_MAX_SIZE CONFIG_TPL_MAX_SIZE - -#include "../cpu/u-boot-spl.lds"
configs/evb-rk3229_defconfig +0 -1
@@ -11,7 +11,6 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3229-evb" CONFIG_SPL_TEXT_BASE=0x60000000 CONFIG_ROCKCHIP_RK322X=y CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 -CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl.lds" CONFIG_TARGET_EVB_RK3229=y CONFIG_SPL_STACK_R_ADDR=0x60600000 CONFIG_DEBUG_UART_BASE=0x11030000
Signature · 1 line
2.25.1
Re: [PATCH 002/149] rk32xx: Use standard TPL linker script
Quoted 5 lines · Tom Rini
As of
2f41ade79e59("linker: Modify linker scripts to be more generic") we can use the same linker script for SPL and TPL and not have to make use of #undef tricks. Remove these last remnants.
Quoted 8 lines
Signed-off-by Tom Rini <[email protected]>--- arch/arm/mach-rockchip/rk3288/Kconfig | 3 --- arch/arm/mach-rockchip/u-boot-tpl.lds | 12 ------------ configs/evb-rk3229_defconfig | 1 - 3 files changed, 16 deletions(-) delete mode 100644 arch/arm/mach-rockchip/u-boot-tpl.lds
PATCH 3/149 Convert CONFIG_NEVER_ASSERT_ODT_TO_CPU to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_NEVER_ASSERT_ODT_TO_CPU
--- arch/powerpc/cpu/mpc83xx/Kconfig | 3 +++ include/configs/MPC837XERDB.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-)
arch/powerpc/cpu/mpc83xx/Kconfig +3 -0
@@ -200,6 +200,9 @@ config FSL_SERDES bool "SerDes initialization" depends on !MPC83XX_SERDES +config NEVER_ASSERT_ODT_TO_CPU + bool "Never assert ODT to internal IOs" + source "board/freescale/mpc837xerdb/Kconfig" source "board/gdsys/mpc8308/Kconfig"
include/configs/MPC837XERDB.h +0 -2
@@ -55,8 +55,6 @@#define CFG_SYS_DDRCDR_VALUE (DDRCDR_DHC_EN | DDRCDR_ODT | DDRCDR_Q_DRN) -#undef CONFIG_NEVER_ASSERT_ODT_TO_CPU/* Never assert ODT to internal IOs */ -/* * Manually set up DDR parameters */
Signature · 1 line
2.25.1
PATCH 4/149 Convert CONFIG_SYS_FPGA_CHECK_BUSY to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_SYS_FPGA_CHECK_BUSY
--- drivers/fpga/Kconfig | 4 ++++ drivers/fpga/spartan2.c | 2 -- drivers/fpga/spartan3.c | 2 -- drivers/fpga/virtex2.c | 7 ++----- 4 files changed, 6 insertions(+), 9 deletions(-)
drivers/fpga/Kconfig +4 -0
@@ -96,6 +96,10 @@ config FPGA_VIRTEX2 Enable Virtex-II FPGA driver for loading in BIT format. This driver also supports many newer Xilinx FPGA families. +config SYS_FPGA_CHECK_BUSY + bool "Perform busy check during load from FPGA" + depends on FPGA_SPARTAN2 || FPGA_SPARTAN3 || FPGA_VIRTEX2 + config FPGA_ZYNQPL bool "Enable Xilinx FPGA for Zynq" depends on ARCH_ZYNQ
drivers/fpga/spartan2.c +0 -2
@@ -10,8 +10,6 @@#include <log.h> #include <spartan2.h> /* Spartan-II device family */ -#undef CONFIG_SYS_FPGA_CHECK_BUSY -/* Note: The assumption is that we cannot possibly run fast enough to * overrun the device (the Slave Parallel mode can free run at 50MHz). * If there is a need to operate slower, define CONFIG_FPGA_DELAY in
drivers/fpga/spartan3.c +0 -2
@@ -15,8 +15,6 @@#include <log.h> #include <spartan3.h> /* Spartan-II device family */ -#undef CONFIG_SYS_FPGA_CHECK_BUSY -/* Note: The assumption is that we cannot possibly run fast enough to * overrun the device (the Slave Parallel mode can free run at 50MHz). * If there is a need to operate slower, define CONFIG_FPGA_DELAY in
drivers/fpga/virtex2.c +2 -5
@@ -21,14 +21,11 @@#include <linux/delay.h> /* -* If the SelectMap interface can be overrun by the processor, define -* CONFIG_SYS_FPGA_CHECK_BUSY and/or CONFIG_FPGA_DELAY in the board +* If the SelectMap interface can be overrun by the processor, enable +* CONFIG_SYS_FPGA_CHECK_BUSY and/or define CONFIG_FPGA_DELAY in the board * configuration file and add board-specific support for checking BUSY status. * By default, assume that the SelectMap interface cannot be overrun. */ -#ifndef CONFIG_SYS_FPGA_CHECK_BUSY -#undef CONFIG_SYS_FPGA_CHECK_BUSY -#endif #ifndef CONFIG_FPGA_DELAY #define CONFIG_FPGA_DELAY ()
Signature · 1 line
2.25.1
PATCH 5/149 mtd: ubi: Finish moving configuration to Kconfig
In reply to Tom RiniWe have some unused and undefined symbols to remove references to, so do that. Move the final things that we do set (or need to keep unset) to Kconfig instead.
--- drivers/mtd/ubi/Kconfig | 12 ++++++++++++ include/ubi_uboot.h | 22 ---------------------- 2 files changed, 12 insertions(+), 22 deletions(-)
drivers/mtd/ubi/Kconfig +12 -0
@@ -20,6 +20,18 @@ config MTD_UBI if MTD_UBI +config MTD_UBI_BLOCK + def_bool n + +config MTD_UBI_MODULE + def_bool y + help + ubi_init() disables returning error codes when built into the Linux + kernel so that it doesn't hang the Linux kernel boot process. Since + the U-Boot driver code depends on getting valid error codes from this + function we just tell the UBI layer that we are building as a module + (which only enables the additional error reporting). + config MTD_UBI_WL_THRESHOLD int "UBI wear-leveling threshold" default 4096
include/ubi_uboot.h +0 -22
@@ -34,28 +34,6 @@#include <linux/errno.h> -/* configurable */ -#define CONFIG_MTD_UBI_BEB_RESERVE 1 - -/* debug options (Linux: drivers/mtd/ubi/Kconfig.debug) */ -#undef CONFIG_MTD_UBI_DEBUG -#undef CONFIG_MTD_UBI_DEBUG_PARANOID -#undef CONFIG_MTD_UBI_DEBUG_MSG -#undef CONFIG_MTD_UBI_DEBUG_MSG_EBA -#undef CONFIG_MTD_UBI_DEBUG_MSG_WL -#undef CONFIG_MTD_UBI_DEBUG_MSG_IO -#undef CONFIG_MTD_UBI_DEBUG_MSG_BLD - -#undef CONFIG_MTD_UBI_BLOCK - -/* ubi_init() disables returning error codes when built into the Linux -* kernel so that it doesn't hang the Linux kernel boot process. Since -* the U-Boot driver code depends on getting valid error codes from this -* function we just tell the UBI layer that we are building as a module -* (which only enables the additional error reporting). -*/ -#define CONFIG_MTD_UBI_MODULE -/* build.c */ #define get_device (...)#define put_device (...)
Signature · 1 line
2.25.1
PATCH 6/149 atmel_nand: Remove undef during SPL_BUILD
In reply to Tom RiniWe cannot disable features in SPL in this manner, remove the undef here.
--- drivers/mtd/nand/raw/atmel_nand.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/mtd/nand/raw/atmel_nand.c +0 -4
@@ -38,10 +38,6 @@ #ifdef CONFIG_ATMEL_NAND_HW_PMECC -#ifdef CONFIG_SPL_BUILD -#undef CONFIG_SYS_NAND_ONFI_DETECTION -#endif - struct atmel_nand_host { struct pmecc_regs __iomem *pmecc; struct pmecc_errloc_regs __iomem *pmerrloc;
Signature · 1 line
2.25.1
PATCH 7/149 valgrind: Rework test for unsupported platforms
In reply to Tom RiniChange things so that on an unsupported platform we will #error rather than undef the feature.
--- include/valgrind/valgrind.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/valgrind/valgrind.h +3 -1
@@ -121,7 +121,9 @@#else /* If we're not compiling for our target platform, don't generate any inline asms. */ -# undef CONFIG_VALGRIND +# if IS_ENABLED (CONFIG_VALGRIND ) +# error "Unsupported platform for valgrind" +# endif #endif
Signature · 1 line
2.25.1
PATCH 8/149 log: Remove some places where we redefine LOGLEVEL
In reply to Tom RiniWe cannot redefine a CONFIG value per file in this manner.
--- drivers/mtd/nand/raw/octeontx_bch.c | 5 ----- drivers/mtd/nand/raw/octeontx_nand.c | 5 ----- test/log/pr_cont_test.c | 3 --- 3 files changed, 13 deletions(-)
drivers/mtd/nand/raw/octeontx_bch.c +0 -5
@@ -27,11 +27,6 @@#include <asm/arch/clock.h> #include "octeontx_bch.h" -#ifdef DEBUG -# undef CONFIG_LOGLEVEL -# define CONFIG_LOGLEVEL 8 -#endif -LIST_HEAD (octeontx_bch_devices);static unsigned int num_vfs =BCH_NR_VF ;static void *bch_pf;
drivers/mtd/nand/raw/octeontx_nand.c +0 -5
@@ -31,11 +31,6 @@#include <asm/arch/clock.h> #include "octeontx_bch.h" -#ifdef DEBUG -# undef CONFIG_LOGLEVEL -# define CONFIG_LOGLEVEL 8 -#endif -/* * The NDF_CMD queue takes commands between 16 - 128 bit. * All commands must be 16 bit aligned and are little endian.
test/log/pr_cont_test.c +0 -3
@@ -16,9 +16,6 @@#define BUFFSIZE 64 -#undef CONFIG_LOGLEVEL -#define CONFIG_LOGLEVEL 4 -DECLARE_GLOBAL_DATA_PTR ;static int log_test_pr_cont (struct unit_test_state *uts)
Signature · 1 line
2.25.1
PATCH 9/149 global: Remove undef CONFIG_... for unused values
In reply to Tom RiniWe have a number of places that undef CONFIG_... while we never reference CONFIG_... in the first place. Remove these lines.
--- common/cli_hush.c | 1 - drivers/ddr/marvell/axp/ddr3_axp_config.h | 2 -- include/configs/P1010RDB.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/s5p4418_nanopi2.h | 2 -- 5 files changed, 7 deletions(-)
common/cli_hush.c +0 -1
@@ -112,7 +112,6 @@#define applet_name "hush"#include "standalone.h" #define hush_main main -#undef CONFIG_FEATURE_SH_FANCY_PROMPT#define BB_BANNER #endif #endif
drivers/ddr/marvell/axp/ddr3_axp_config.h +0 -2
@@ -59,12 +59,10 @@/* Marvell boards specific configurations */ #if defined(DB_78X60_PCAC ) -#undef CONFIG_SPD_EEPROM#define STATIC_TRAINING #endif #if defined(DB_78X60_AMC ) -#undef CONFIG_SPD_EEPROM#undef DRAM_ECC#define DRAM_ECC 1#endif
include/configs/P1010RDB.h +0 -1
@@ -309,7 +309,6 @@ extern unsigned long get_sdram_size(void);#endif /* Serial Port */ -#undef CONFIG_SERIAL_SOFTWARE_FIFO#define CFG_SYS_NS16550_CLK get_bus_freq(0)#define CFG_SYS_BAUDRATE_TABLE \
include/configs/p1_p2_rdb_pc.h +0 -1
@@ -302,7 +302,6 @@* open - index 2 * shorted - index 1 */ -#undef CONFIG_SERIAL_SOFTWARE_FIFO#define CFG_SYS_NS16550_CLK get_bus_freq(0)#define CFG_SYS_BAUDRATE_TABLE \
include/configs/s5p4418_nanopi2.h +0 -2
@@ -66,8 +66,6 @@/*----------------------------------------------------------------------- * High Level System Configuration */ -/* Not used: not need IRQ/FIQ stuff */ -#undef CONFIG_USE_IRQ/* decrementer freq: 1ms ticks */ /*-----------------------------------------------------------------------
Signature · 1 line
2.25.1
PATCH 10/149 rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY
In reply to Tom RiniWhile we do not want to use CONFIG_RSA_VERIFY_WITH_PKEY on the host, we cannot undef the symbol in this manner. As this ends up only being a single location in a file that already has other checks for HOST_CC, add one more HOST_CC check instead.
--- lib/rsa/rsa-verify.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
lib/rsa/rsa-verify.c +2 -5
@@ -23,18 +23,13 @@#include <u-boot/rsa-mod-exp.h> #include <u-boot/rsa.h> -#ifndef __UBOOT__/* * NOTE: * Since host tools, like mkimage, make use of openssl library for * RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are * of no use and should not be compiled in. -* So just turn off CONFIG_RSA_VERIFY_WITH_PKEY. */ -#undef CONFIG_RSA_VERIFY_WITH_PKEY -#endif -/* Default public exponent for backward compatibility */ #define RSA_DEFAULT_PUBEXP 65537
@@ -506,6 +501,7 @@ int rsa_verify_hash(struct image_sign_info *info, {int ret = -EACCES ; +#if !defined(USE_HOSTCC )if (CONFIG_IS_ENABLED (RSA_VERIFY_WITH_PKEY ) && !info->fdt_blob) {/* don't rely on fdt properties */ ret =rsa_verify_with_pkey (info, hash, sig, sig_len);
@@ -513,6 +509,7 @@ int rsa_verify_hash(struct image_sign_info *info,debug ("%s: rsa_verify_with_pkey() failed\n" , __func__); return ret; } +#endif if (CONFIG_IS_ENABLED (FIT_SIGNATURE )) {const void *blob = info->fdt_blob;
Signature · 1 line
2.25.1
Re: [PATCH 010/149] rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY
Hi Tom,
Quoted 35 lines · Tom Rini
While we do not want to use
CONFIG_RSA_VERIFY_WITH_PKEYon the host, we cannot undef the symbol in this manner. As this ends up only being a single location in a file that already has other checks forHOST_CC, add one moreHOST_CCcheck instead.Signed-off-by Tom Rini <[email protected]>--- lib/rsa/rsa-verify.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)lib/rsa/rsa-verify.c +0
-5@@ -23,18 +23,13 @@#include <u-boot/rsa-mod-exp.h> #include <u-boot/rsa.h> -#ifndef __UBOOT__/* * NOTE: * Since host tools, like mkimage, make use of openssl library for * RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are * of no use and should not be compiled in. -* So just turn off CONFIG_RSA_VERIFY_WITH_PKEY. */ -#undef CONFIG_RSA_VERIFY_WITH_PKEY -#endif -/* Default public exponent for backward compatibility */ #define RSA_DEFAULT_PUBEXP 65537
lib/rsa/rsa-verify.c int rsa_verify_hash(struct image_sign_info *info, · line 504
Quoted 4 lines
lib/rsa/rsa-verify.c +1
-0@@ -506,6 +501,7 @@ int rsa_verify_hash(struct image_sign_info *info, {int ret = -EACCES ; +#if !defined(USE_HOSTCC )
you can use
if tools_build()
here, I believe. I've been trying to avoid #if USE_HOSTCC
Quoted 12 lines
lib/rsa/rsa-verify.c +1
-1if (CONFIG_IS_ENABLED (RSA_VERIFY_WITH_PKEY ) && !info->fdt_blob) {/* don't rely on fdt properties */ ret =rsa_verify_with_pkey (info, hash, sig, sig_len);@@ -513,6 +509,7 @@ int rsa_verify_hash(struct image_sign_info *info,debug ("%s: rsa_verify_with_pkey() failed\n" , __func__); return ret; } +#endif if (CONFIG_IS_ENABLED (FIT_SIGNATURE )) {const void *blob = info->fdt_blob; --
Quoted 2 lines
2.25.1
Regards,
Simon
PATCH v2 10/149 rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY
In reply to Tom RiniWhile we do not want to use CONFIG_RSA_VERIFY_WITH_PKEY on the host, we cannot undef the symbol in this manner. As this ends up being a test within another function we can use !tools_build() as a test here.
---
Changes in v2:
- Switch to !tools_build() per Simon
--- lib/rsa/rsa-verify.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
lib/rsa/rsa-verify.c +2 -6
@@ -23,18 +23,13 @@#include <u-boot/rsa-mod-exp.h> #include <u-boot/rsa.h> -#ifndef __UBOOT__/* * NOTE: * Since host tools, like mkimage, make use of openssl library for * RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are * of no use and should not be compiled in. -* So just turn off CONFIG_RSA_VERIFY_WITH_PKEY. */ -#undef CONFIG_RSA_VERIFY_WITH_PKEY -#endif -/* Default public exponent for backward compatibility */ #define RSA_DEFAULT_PUBEXP 65537
@@ -506,7 +501,8 @@ int rsa_verify_hash(struct image_sign_info *info, {int ret = -EACCES ; -if (CONFIG_IS_ENABLED (RSA_VERIFY_WITH_PKEY ) && !info->fdt_blob) { +if (!tools_build () &&CONFIG_IS_ENABLED (RSA_VERIFY_WITH_PKEY ) && + !info->fdt_blob) {/* don't rely on fdt properties */ ret =rsa_verify_with_pkey (info, hash, sig, sig_len);if (ret)
Signature · 1 line
2.25.1
Re: [PATCHv2 010/149] rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY
Quoted 5 lines · Tom Rini
While we do not want to use
CONFIG_RSA_VERIFY_WITH_PKEYon the host, we cannot undef the symbol in this manner. As this ends up being a test within another function we can use !tools_build() as a test here.
Quoted 8 lines
Cc Simon Glass <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Changes in v2:
- Switch to !tools_build() per Simon--- lib/rsa/rsa-verify.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
Re: [PATCHv2 010/149] rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY
In reply to Tom RiniQuoted 19 lines · Tom Rini
While we do not want to use
CONFIG_RSA_VERIFY_WITH_PKEYon the host, we cannot undef the symbol in this manner. As this ends up being a test within another function we can use !tools_build() as a test here.Cc Simon Glass <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Changes in v2:
- Switch to !tools_build() per Simon--- lib/rsa/rsa-verify.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)lib/rsa/rsa-verify.c +0
-0@@ -23,18 +23,13 @@#include <u-boot/rsa-mod-exp.h>
lib/rsa/rsa-verify.c line 31
Quoted 10 lines
lib/rsa/rsa-verify.c +0
-2#include <u-boot/rsa.h> -#ifndef __UBOOT__/* * NOTE: * Since host tools, like mkimage, make use of openssl library for * RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are * of no use and should not be compiled in. -* So just turn off CONFIG_RSA_VERIFY_WITH_PKEY. */
I think you can delete the whole comment here. If you think it's still helpful, please place it below in the function.
-Takahiro Akashi
Quoted 19 lines
lib/rsa/rsa-verify.c +2
-4-#undef CONFIG_RSA_VERIFY_WITH_PKEY -#endif -/* Default public exponent for backward compatibility */ #define RSA_DEFAULT_PUBEXP 65537@@ -506,7 +501,8 @@ int rsa_verify_hash(struct image_sign_info *info, {int ret = -EACCES ; -if (CONFIG_IS_ENABLED (RSA_VERIFY_WITH_PKEY ) && !info->fdt_blob) { +if (!tools_build () &&CONFIG_IS_ENABLED (RSA_VERIFY_WITH_PKEY ) && + !info->fdt_blob) {/* don't rely on fdt properties */ ret =rsa_verify_with_pkey (info, hash, sig, sig_len);if (ret)Signature · 1 line
2.25.1
PATCH v3 10/149 rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY
In reply to Tom RiniWhile we do not want to use CONFIG_RSA_VERIFY_WITH_PKEY on the host, we cannot undef the symbol in this manner. As this ends up being a test within another function we can use !tools_build() as a test here.
---
Changes in v3:
- Move comment, per Akashi-san
Changes in v2:
- Switch to !tools_build() per Simon
--- lib/rsa/rsa-verify.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
lib/rsa/rsa-verify.c +7 -13
@@ -23,18 +23,6 @@#include <u-boot/rsa-mod-exp.h> #include <u-boot/rsa.h> -#ifndef __UBOOT__ -/* -* NOTE: -* Since host tools, like mkimage, make use of openssl library for -* RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are -* of no use and should not be compiled in. -* So just turn off CONFIG_RSA_VERIFY_WITH_PKEY. -*/ - -#undef CONFIG_RSA_VERIFY_WITH_PKEY -#endif -/* Default public exponent for backward compatibility */ #define RSA_DEFAULT_PUBEXP 65537
@@ -506,7 +494,13 @@ int rsa_verify_hash(struct image_sign_info *info, {int ret = -EACCES ; -if (CONFIG_IS_ENABLED (RSA_VERIFY_WITH_PKEY ) && !info->fdt_blob) { +/* +* Since host tools, like mkimage, make use of openssl library for +* RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are +* of no use and should not be compiled in. +*/ +if (!tools_build () &&CONFIG_IS_ENABLED (RSA_VERIFY_WITH_PKEY ) && + !info->fdt_blob) {/* don't rely on fdt properties */ ret =rsa_verify_with_pkey (info, hash, sig, sig_len);if (ret)
Signature · 1 line
2.25.1
Re: [PATCHv3 010/149] rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY
Quoted 8 lines · Tom Rini
While we do not want to use
CONFIG_RSA_VERIFY_WITH_PKEYon the host, we cannot undef the symbol in this manner. As this ends up being a test within another function we can use !tools_build() as a test here.Cc AKASHI Takahiro <[email protected]>Cc Simon Glass <[email protected]>Signed-off-by Tom Rini <[email protected]>
Quoted 8 lines
---
Changes in v3:
- Move comment, per Akashi-san
Changes in v2:
- Switch to !tools_build() per Simon--- lib/rsa/rsa-verify.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
PATCH 11/149 global: Migrate CONFIG_ARM_GIC_BASE_ADDRESS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_ARM_GIC_BASE_ADDRESS to CFG_ARM_GIC_BASE_ADDRESS
--- arch/arm/cpu/armv7/nonsec_virt.S | 4 ++-- arch/arm/cpu/armv7/virt-v7.c | 4 ++-- include/configs/arndale.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/cpu/armv7/nonsec_virt.S +2 -2
@@ -112,8 +112,8 @@ ENTRY(_do_nonsec_entry) ENDPROC(_do_nonsec_entry) .macro get_cbar_addr addr -#ifdef CONFIG_ARM_GIC_BASE_ADDRESS - ldr \addr, =CONFIG_ARM_GIC_BASE_ADDRESS +#ifdef CFG_ARM_GIC_BASE_ADDRESS + ldr \addr, =CFG_ARM_GIC_BASE_ADDRESS #else mrc p15, 4, \addr, c15, c0, 0 @ read CBAR bfc \addr, #0, #15 @ clear reserved bits
arch/arm/cpu/armv7/virt-v7.c +2 -2
@@ -26,8 +26,8 @@ static unsigned int read_id_pfr1(void)static unsigned long get_gicd_base_address (void ) { -#ifdef CONFIG_ARM_GIC_BASE_ADDRESS -return CONFIG_ARM_GIC_BASE_ADDRESS +GIC_DIST_OFFSET ; +#ifdef CFG_ARM_GIC_BASE_ADDRESS +return CFG_ARM_GIC_BASE_ADDRESS +GIC_DIST_OFFSET ;#else unsigned periphbase;
include/configs/arndale.h +1 -1
@@ -19,6 +19,6 @@#define CONFIG_SMP_PEN_ADDR 0x02020000/* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */ -#define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000 +#define CFG_ARM_GIC_BASE_ADDRESS 0x10480000#endif /* __CONFIG_H */
Signature · 1 line
2.25.1
PATCH 12/149 global: Migrate CONFIG_BOARDDIR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_BOARDDIR to CFG_BOARDDIR
--- arch/sh/cpu/u-boot.lds | 2 +- doc/README.kwbimage | 2 +- scripts/Makefile.autoconf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/sh/cpu/u-boot.lds +1 -1
@@ -35,7 +35,7 @@ SECTIONS .text : { KEEP(*/start.o (.text)) - KEEP(CONFIG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text)) + KEEP(CFG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text)) KEEP(*(.spiboot2.text)) . = ALIGN(8192); #ifdef CONFIG_ENV_IS_IN_FLASH
doc/README.kwbimage +1 -1
@@ -42,7 +42,7 @@ Board specific configuration file specifications: kwbimage.cfg. The name can be set as part of the full path to the file using CONFIG_SYS_KWD_CONFIG (probably in include/configs/<yourboard>.h). The path should look like: - $(CONFIG_BOARDDIR)/<yourkwbimagename>.cfg + $(CFG_BOARDDIR)/<yourkwbimagename>.cfg 2. This file can have empty lines and lines starting with "#" as first character to put comments 3. This file can have configuration command lines as mentioned below,
scripts/Makefile.autoconf +1 -1
@@ -112,7 +112,7 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg # Prior to Kconfig, it was generated by mkconfig. Now it is created here. define filechk_config_h (echo "/* Automatically generated - do not edit */"; \ - echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ + echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ echo \#include \<config_uncmd_spl.h\>; \ echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \ echo \#include \<asm/config.h\>; \
Signature · 1 line
2.25.1
PATCH 13/149 global: Migrate CONFIG_DFU_ALT et al to CFG
In reply to Tom RiniPerform simple renames of:
CONFIG_DFU_ALT to CFG_DFU_ALT CONFIG_DFU_ALT_BOOT_EMMC to CFG_DFU_ALT_BOOT_EMMC CONFIG_DFU_ALT_BOOT_SD to CFG_DFU_ALT_BOOT_SD CONFIG_DFU_ALT_SYSTEM to CFG_DFU_ALT_SYSTEM CONFIG_DFU_ENV_SETTINGS to CFG_DFU_ENV_SETTINGS
--- board/samsung/common/exynos5-dt.c | 4 ++-- board/samsung/odroid/odroid.c | 4 ++-- include/configs/mx7dsabresd.h | 4 ++-- include/configs/odroid.h | 8 ++++---- include/configs/odroid_xu3.h | 8 ++++---- include/configs/pico-imx6.h | 4 ++-- include/configs/pico-imx6ul.h | 4 ++-- include/configs/pico-imx7d.h | 4 ++-- include/configs/s5p_goni.h | 4 ++-- include/configs/trats.h | 4 ++-- include/configs/trats2.h | 4 ++-- include/configs/warp7.h | 4 ++-- 12 files changed, 28 insertions(+), 28 deletions(-)
board/samsung/common/exynos5-dt.c +2 -2
@@ -179,9 +179,9 @@ char *get_dfu_alt_boot(char *interface, char *devstr)return NULL ;if (IS_SD (mmc)) - alt_boot =CONFIG_DFU_ALT_BOOT_SD ; + alt_boot =CFG_DFU_ALT_BOOT_SD ;else - alt_boot =CONFIG_DFU_ALT_BOOT_EMMC ; + alt_boot =CFG_DFU_ALT_BOOT_EMMC ;return alt_boot; }
board/samsung/odroid/odroid.c +2 -2
@@ -94,8 +94,8 @@ char *get_dfu_alt_boot(char *interface, char *devstr)if (mmc_init (mmc))return NULL ; - alt_boot =IS_SD (mmc) ?CONFIG_DFU_ALT_BOOT_SD : -CONFIG_DFU_ALT_BOOT_EMMC ; + alt_boot =IS_SD (mmc) ?CFG_DFU_ALT_BOOT_SD : +CFG_DFU_ALT_BOOT_EMMC ;return alt_boot; }
include/configs/mx7dsabresd.h +2 -2
@@ -44,7 +44,7 @@"initrd_high=0xffffffff\0" \"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ -#define CONFIG_DFU_ENV_SETTINGS \ +#define CFG_DFU_ENV_SETTINGS \"dfu_alt_info=image raw 0 0x800000;" \"u-boot raw 0 0x4000;" \"bootimg part 0 1;" \
@@ -53,7 +53,7 @@#define CONFIG_EXTRA_ENV_SETTINGS \ UPDATE_M4_ENV \ CONFIG_MFG_ENV_SETTINGS \ - CONFIG_DFU_ENV_SETTINGS \ + CFG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \
include/configs/odroid.h +4 -4
@@ -27,7 +27,7 @@#define PARTS_BOOT "boot"#define PARTS_ROOT "platform" -#define CONFIG_DFU_ALT \ +#define CFG_DFU_ALT \ "uImage fat 0 1;" \ "zImage fat 0 1;" \ "Image.itb fat 0 1;" \
@@ -39,13 +39,13 @@#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) -#define CONFIG_DFU_ALT_BOOT_EMMC \ +#define CFG_DFU_ALT_BOOT_EMMC \ "u-boot raw 0x3e 0x800 mmcpart 1;" \ "bl1 raw 0x0 0x1e mmcpart 1;" \ "bl2 raw 0x1e 0x1d mmcpart 1;" \ "tzsw raw 0x83e 0x138 mmcpart 1\0" -#define CONFIG_DFU_ALT_BOOT_SD \ +#define CFG_DFU_ALT_BOOT_SD \ "u-boot raw 0x3f 0x800;" \ "bl1 raw 0x1 0x1e;" \ "bl2 raw 0x1f 0x1d;" \
@@ -132,7 +132,7 @@"mmcbootpart=1\0" \"mmcrootdev=0\0" \"mmcrootpart=2\0" \ -"dfu_alt_system=" CONFIG_DFU_ALT \ +"dfu_alt_system=" CFG_DFU_ALT \"dfu_alt_info=Please reset the board\0" \"consoleon=set console console=ttySAC1,115200n8; save; reset\0" \"consoleoff=set console console=ram; save; reset\0" \
include/configs/odroid_xu3.h +4 -4
@@ -20,7 +20,7 @@#define DFU_DEFAULT_POLL_TIMEOUT 300#define DFU_MANIFEST_POLL_TIMEOUT 25000 -#define CONFIG_DFU_ALT_SYSTEM \ +#define CFG_DFU_ALT_SYSTEM \ "uImage fat 0 1;" \ "zImage fat 0 1;" \ "Image.itb fat 0 1;" \
@@ -34,14 +34,14 @@"boot part 0 1;" \ "root part 0 2\0" -#define CONFIG_DFU_ALT_BOOT_EMMC \ +#define CFG_DFU_ALT_BOOT_EMMC \ "u-boot raw 0x3e 0x800 mmcpart 1;" \ "bl1 raw 0x0 0x1e mmcpart 1;" \ "bl2 raw 0x1e 0x1d mmcpart 1;" \ "tzsw raw 0x83e 0x200 mmcpart 1;" \ "params.bin raw 0x1880 0x20\0" -#define CONFIG_DFU_ALT_BOOT_SD \ +#define CFG_DFU_ALT_BOOT_SD \ "u-boot raw 0x3f 0x800;" \ "bl1 raw 0x1 0x1e;" \ "bl2 raw 0x1f 0x1d;" \
@@ -75,7 +75,7 @@"mmcrootdev=0\0" \"mmcbootpart=1\0" \"mmcrootpart=2\0" \ -"dfu_alt_system=" CONFIG_DFU_ALT_SYSTEM \ +"dfu_alt_system=" CFG_DFU_ALT_SYSTEM \ "dfu_alt_info=Autoset by THOR/DFU command run.\0"#endif /* __CONFIG_H */
include/configs/pico-imx6.h +2 -2
@@ -21,7 +21,7 @@#define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_DFU_ENV_SETTINGS \ +#define CFG_DFU_ENV_SETTINGS \ "dfu_alt_info=" \ "spl raw 0x2 0x400;" \ "u-boot raw 0x8a 0x1000;" \
@@ -47,7 +47,7 @@"fdt_addr_r=0x18000000\0" \"fdt_addr=0x18000000\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ -CONFIG_DFU_ENV_SETTINGS \ +CFG_DFU_ENV_SETTINGS \"finduuid=part uuid mmc 0:1 uuid\0" \"findfdt=" \"if test $baseboard = hobbit && test $board_rev = MX6Q ; then " \
include/configs/pico-imx6ul.h +2 -2
@@ -28,7 +28,7 @@#define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_DFU_ENV_SETTINGS \ +#define CFG_DFU_ENV_SETTINGS \ "dfu_alt_info=" \ "spl raw 0x2 0x400;" \ "u-boot raw 0x8a 0x400;" \
@@ -63,7 +63,7 @@"ramdiskaddr=0x83000000\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \"mmcautodetect=yes\0" \ -CONFIG_DFU_ENV_SETTINGS \ +CFG_DFU_ENV_SETTINGS \"findfdt=" \"if test $fdtfile = ask ; then " \"bootmenu -1; fi;" \
include/configs/pico-imx7d.h +2 -2
@@ -15,7 +15,7 @@/* MMC Config */ #define CFG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_DFU_ENV_SETTINGS \ +#define CFG_DFU_ENV_SETTINGS \ "dfu_alt_info=" \ "spl raw 0x2 0x400;" \ "u-boot raw 0x8a 0x1000;" \
@@ -67,7 +67,7 @@"ramdisk_addr_r=0x83000000\0" \"ramdiskaddr=0x83000000\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ -CONFIG_DFU_ENV_SETTINGS \ +CFG_DFU_ENV_SETTINGS \"findfdt=" \"if test $fdtfile = ask ; then " \"bootmenu -1; fi;" \
include/configs/s5p_goni.h +2 -2
@@ -35,7 +35,7 @@#define PARTS_CSC "csc"#define PARTS_UMS "ums" -#define CONFIG_DFU_ALT \ +#define CFG_DFU_ALT \ "u-boot raw 0x80 0x400;" \ "uImage ext4 0 2;" \ "exynos3-goni.dtb ext4 0 2;" \
@@ -102,7 +102,7 @@"ubiblock=8\0" \"ubi=enabled\0" \"opts=always_resume=1\0" \ -"dfu_alt_info=" CONFIG_DFU_ALT "\0" +"dfu_alt_info=" CFG_DFU_ALT "\0" /* Goni has 3 banks of DRAM, but swap the bank */ #define PHYS_SDRAM_1 CFG_SYS_SDRAM_BASE /* OneDRAM Bank #0 */
include/configs/trats.h +2 -2
@@ -39,7 +39,7 @@"name=" PARTS_DATA ",size=3000MiB,uuid=${uuid_gpt_" PARTS_DATA "};" \"name=" PARTS_UMS ",size=-,uuid=${uuid_gpt_" PARTS_UMS "}\0" \ -#define CONFIG_DFU_ALT \ +#define CFG_DFU_ALT \"u-boot raw 0x80 0x400;" \"/uImage ext4 0 2;" \"/modem.bin ext4 0 2;" \
@@ -98,7 +98,7 @@"mmcrootpart=5\0" \"opts=always_resume=1\0" \"partitions=" PARTS_DEFAULT \ -"dfu_alt_info=" CONFIG_DFU_ALT \ +"dfu_alt_info=" CFG_DFU_ALT \"spladdr=0x40000100\0" \"splsize=0x200\0" \"splfile=falcon.bin\0" \
include/configs/trats2.h +2 -2
@@ -40,7 +40,7 @@"name=" PARTS_DATA ",size=3000MiB,uuid=${uuid_gpt_" PARTS_DATA "};" \"name=" PARTS_UMS ",size=-,uuid=${uuid_gpt_" PARTS_UMS "}\0" \ -#define CONFIG_DFU_ALT \ +#define CFG_DFU_ALT \"u-boot raw 0x80 0x800;" \"/uImage ext4 0 2;" \"/modem.bin ext4 0 2;" \
@@ -86,7 +86,7 @@"mmcrootpart=5\0" \"opts=always_resume=1\0" \"partitions=" PARTS_DEFAULT \ -"dfu_alt_info=" CONFIG_DFU_ALT \ +"dfu_alt_info=" CFG_DFU_ALT \"uartpath=ap\0" \"usbpath=ap\0" \"consoleon=set console console=ttySAC2,115200n8; save; reset\0" \
include/configs/warp7.h +2 -2
@@ -16,7 +16,7 @@/* MMC Config*/ #define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR -#define CONFIG_DFU_ENV_SETTINGS \ +#define CFG_DFU_ENV_SETTINGS \ "dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \/* When booting with FIT specify the node entry containing boot.scr */
@@ -27,7 +27,7 @@#endif #define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_DFU_ENV_SETTINGS \ + CFG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \ "bootscr_fitimage_name=bootscr\0" \ "script_signed=boot.scr.imx-signed\0" \
Signature · 1 line
2.25.1
PATCH 14/149 global: Migrate CONFIG_DW_WDT_CLOCK_KHZ to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_DW_WDT_CLOCK_KHZ to CFG_DW_WDT_CLOCK_KHZ
--- drivers/watchdog/designware_wdt.c | 2 +- include/configs/socfpga_common.h | 2 +- include/configs/socfpga_soc64_common.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/watchdog/designware_wdt.c +1 -1
@@ -132,7 +132,7 @@ static int designware_wdt_probe(struct udevice *dev) goto err; }#else - priv->clk_khz =CONFIG_DW_WDT_CLOCK_KHZ ; + priv->clk_khz =CFG_DW_WDT_CLOCK_KHZ ;#endif if (CONFIG_IS_ENABLED(DM_RESET) &&
include/configs/socfpga_common.h +1 -1
@@ -64,7 +64,7 @@/* * L4 Watchdog */ -#define CONFIG_DW_WDT_CLOCK_KHZ 25000 +#define CFG_DW_WDT_CLOCK_KHZ 25000/* * NAND Support
include/configs/socfpga_soc64_common.h +2 -2
@@ -90,10 +90,10 @@#ifdef CONFIG_TARGET_SOCFPGA_STRATIX10 #ifndef __ASSEMBLY__unsigned int cm_get_l4_sys_free_clk_hz (void ); -#define CONFIG_DW_WDT_CLOCK_KHZ (cm_get_l4_sys_free_clk_hz() / 1000) +#define CFG_DW_WDT_CLOCK_KHZ (cm_get_l4_sys_free_clk_hz() / 1000)#endif #else -#define CONFIG_DW_WDT_CLOCK_KHZ 100000 +#define CFG_DW_WDT_CLOCK_KHZ 100000#endif /*
Signature · 1 line
2.25.1
PATCH 15/149 global: Migrate CONFIG_ENV_FLAGS_LIST_STATIC to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_ENV_FLAGS_LIST_STATIC to CFG_ENV_FLAGS_LIST_STATIC
--- README | 6 +++--- include/configs/aristainetos2.h | 2 +- include/configs/imx6q-bosch-acc.h | 2 +- include/env_flags.h | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-)
README +3 -3
@@ -1066,7 +1066,7 @@ The following options need to be configured: The same can be accomplished in a more flexible way for any variable by configuring the type of access to allow for those variables in the ".flags" variable - or define CONFIG_ENV_FLAGS_LIST_STATIC. + or define CFG_ENV_FLAGS_LIST_STATIC. - Protected RAM: CONFIG_PRAM
@@ -1405,7 +1405,7 @@ Configuration Settings: Use buffered writes to flash. - CONFIG_ENV_FLAGS_LIST_DEFAULT -- CONFIG_ENV_FLAGS_LIST_STATIC +- CFG_ENV_FLAGS_LIST_STATIC Enable validation of the values given to environment variables when calling env set. Variables can be restricted to only decimal, hexadecimal, or boolean. If CONFIG_CMD_NET is also defined,
@@ -1436,7 +1436,7 @@ Configuration Settings: Define this to a list (string) to define the ".flags" environment variable in the default or embedded environment. - - CONFIG_ENV_FLAGS_LIST_STATIC + - CFG_ENV_FLAGS_LIST_STATIC Define this to a list (string) to define validation that should be done if an entry is not found in the ".flags" environment variable. To override a setting in the static
include/configs/aristainetos2.h +1 -1
@@ -418,7 +418,7 @@/* UBI support */ -#define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \ +#define CFG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \ "sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"#endif /* __ARISTAINETOS2_CONFIG_H */
include/configs/imx6q-bosch-acc.h +1 -1
@@ -45,7 +45,7 @@"save_env=env save; env save\0" \"altbootcmd=run handle_ustate; run switch_bootset; run save_env; run bootcmd\0" -#define CONFIG_ENV_FLAGS_LIST_STATIC \ +#define CFG_ENV_FLAGS_LIST_STATIC \"bootset:bw," \"clone_pending:bw," \"endurance_test:bw," \
include/env_flags.h +3 -3
@@ -35,8 +35,8 @@ enum env_flags_varaccess {#define ENV_FLAGS_VARTYPE_LOC 0#define ENV_FLAGS_VARACCESS_LOC 1 -#ifndef CONFIG_ENV_FLAGS_LIST_STATIC -#define CONFIG_ENV_FLAGS_LIST_STATIC "" +#ifndef CFG_ENV_FLAGS_LIST_STATIC +#define CFG_ENV_FLAGS_LIST_STATIC ""#endif #ifdef CONFIG_NET
@@ -77,7 +77,7 @@ enum env_flags_varaccess {ETHADDR_FLAGS \ NET_FLAGS \SERIAL_FLAGS \ - CONFIG_ENV_FLAGS_LIST_STATIC + CFG_ENV_FLAGS_LIST_STATIC#ifdef CONFIG_CMD_ENV_FLAGS /*
Signature · 1 line
2.25.1
PATCH 16/149 global: Migrate CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS to CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
--- include/configs/draco.h | 4 ++-- include/configs/etamin.h | 4 ++-- include/configs/pxm2.h | 4 ++-- include/configs/rastaban.h | 4 ++-- include/configs/thuban.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-)
include/configs/draco.h +2 -2
@@ -19,7 +19,7 @@#define BOARD_DFU_BUTTON_GPIO 27/* Use as default */ #define GPIO_LAN9303_NRST 88/* GPIO2_24 = gpio88 */ -#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "button_dfu0=27\0" \ "led0=103,1,0\0" \ "led1=64,0,1\0"
@@ -34,7 +34,7 @@"nand_img_size=0x400000\0" \"optargs=\0" \"preboot=draco_led 0\0" \ -CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \CONFIG_ENV_SETTINGS_V2 \CONFIG_ENV_SETTINGS_NAND_V2
include/configs/etamin.h +2 -2
@@ -56,7 +56,7 @@#define BOARD_DFU_BUTTON_GPIO 27#define GPIO_LAN9303_NRST 88/* GPIO2_24 = gpio88 */ /* In dfu mode keep led1 on */ -#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "button_dfu0=27\0" \ "button_dfu1=87\0" \ "led0=3,0,1\0" \
@@ -134,7 +134,7 @@"nand_img_size=0x400000\0" \"optargs=\0" \"preboot=draco_led 0\0" \ -CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \CONFIG_ENV_SETTINGS_V2 \CONFIG_ENV_SETTINGS_NAND_V2
include/configs/pxm2.h +2 -2
@@ -18,7 +18,7 @@#define DDR_IOCTRL_VAL 0x18b#define DDR_PLL_FREQ 266 -#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "button_dfu0=59\0" \ "led0=117,0,1\0" \
@@ -34,7 +34,7 @@"nand_img_size=0x500000\0" \"optargs=\0" \"preboot=draco_led 0\0" \ -CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \"splashpos=m,m\0" \CONFIG_ENV_SETTINGS_V1 \CONFIG_ENV_SETTINGS_NAND_V1 \
include/configs/rastaban.h +2 -2
@@ -21,7 +21,7 @@#define BOARD_DFU_BUTTON_GPIO 27#define GPIO_LAN9303_NRST 88/* GPIO2_24 = gpio88 */ /* In dfu mode keep led1 on */ -#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "button_dfu0=27\0" \ "button_dfu1=87\0" \ "led0=3,0,1\0" \
@@ -44,7 +44,7 @@"nand_img_size=0x400000\0" \"optargs=\0" \"preboot=draco_led 0\0" \ -CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \CONFIG_ENV_SETTINGS_V2 \CONFIG_ENV_SETTINGS_NAND_V2
include/configs/thuban.h +2 -2
@@ -19,7 +19,7 @@#define BOARD_DFU_BUTTON_GPIO 27/* Use as default */ #define GPIO_LAN9303_NRST 88/* GPIO2_24 = gpio88 */ -#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "button_dfu0=27\0" \ "led0=103,1,0\0" \ "led1=64,0,1\0"
@@ -37,7 +37,7 @@"nand_img_size=0x400000\0" \"optargs=\0" \"preboot=draco_led 0\0" \ -CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \CONFIG_ENV_SETTINGS_V2 \CONFIG_ENV_SETTINGS_NAND_V2
Signature · 1 line
2.25.1
PATCH 17/149 global: Migrate CONFIG_ENV_SETTINGS_NAND_V1 to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_ENV_SETTINGS_NAND_V1 to CFG_ENV_SETTINGS_NAND_V1
--- include/configs/pxm2.h | 2 +- include/configs/rut.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
include/configs/pxm2.h +1 -1
@@ -37,7 +37,7 @@CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \"splashpos=m,m\0" \CONFIG_ENV_SETTINGS_V1 \ -CONFIG_ENV_SETTINGS_NAND_V1 \ +CFG_ENV_SETTINGS_NAND_V1 \"mmc_dev=0\0" \"mmc_root=/dev/mmcblk0p2 rw\0" \"mmc_root_fs_type=ext4 rootwait\0" \
include/configs/rut.h +1 -1
@@ -34,7 +34,7 @@"splashpos=m,m\0" \"optargs=fixrtc --no-log consoleblank=0 \0" \CONFIG_ENV_SETTINGS_V1 \ -CONFIG_ENV_SETTINGS_NAND_V1 \ +CFG_ENV_SETTINGS_NAND_V1 \"mmc_dev=0\0" \"mmc_root=/dev/mmcblk0p2 rw\0" \"mmc_root_fs_type=ext4 rootwait\0" \
include/configs/siemens-am33x-common.h +1 -1
@@ -196,7 +196,7 @@"kernel_b part 0 8;" \"rootfs partubi 0 10" -#define CONFIG_ENV_SETTINGS_NAND_V1 \ +#define CFG_ENV_SETTINGS_NAND_V1 \"nand_active_ubi_vol=rootfs_a\0" \"nand_active_ubi_vol_A=rootfs_a\0" \"nand_active_ubi_vol_B=rootfs_b\0" \
Signature · 1 line
2.25.1
PATCH 18/149 global: Migrate CONFIG_ENV_SETTINGS_NAND_V2 to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_ENV_SETTINGS_NAND_V2 to CFG_ENV_SETTINGS_NAND_V2
--- include/configs/draco.h | 2 +- include/configs/etamin.h | 6 +++--- include/configs/rastaban.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/thuban.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
include/configs/draco.h +1 -1
@@ -36,6 +36,6 @@"preboot=draco_led 0\0" \CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \CONFIG_ENV_SETTINGS_V2 \ - CONFIG_ENV_SETTINGS_NAND_V2 + CFG_ENV_SETTINGS_NAND_V2#endif /* ! __CONFIG_DRACO_H */
include/configs/etamin.h +3 -3
@@ -93,8 +93,8 @@"u-boot.env1 mtddev;" \ "rootfs mtddevubi" \ -#undef CONFIG_ENV_SETTINGS_NAND_V2 -#define CONFIG_ENV_SETTINGS_NAND_V2 \ +#undef CFG_ENV_SETTINGS_NAND_V2 +#define CFG_ENV_SETTINGS_NAND_V2 \ "nand_active_ubi_vol=rootfs_a\0" \ "rootfs_name=rootfs\0" \ "kernel_name=uImage\0"\
@@ -136,6 +136,6 @@"preboot=draco_led 0\0" \CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \CONFIG_ENV_SETTINGS_V2 \ - CONFIG_ENV_SETTINGS_NAND_V2 + CFG_ENV_SETTINGS_NAND_V2#endif /* ! __CONFIG_ETAMIN_H */
include/configs/rastaban.h +1 -1
@@ -46,6 +46,6 @@"preboot=draco_led 0\0" \CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \CONFIG_ENV_SETTINGS_V2 \ - CONFIG_ENV_SETTINGS_NAND_V2 + CFG_ENV_SETTINGS_NAND_V2#endif /* ! __CONFIG_RASTABAN_H */
include/configs/siemens-am33x-common.h +1 -1
@@ -273,7 +273,7 @@"u-boot.env1 part 0 7;" \"rootfs partubi 0 9" \ -#define CONFIG_ENV_SETTINGS_NAND_V2 \ +#define CFG_ENV_SETTINGS_NAND_V2 \"nand_active_ubi_vol=rootfs_a\0" \"rootfs_name=rootfs\0" \"kernel_name=uImage\0" \
include/configs/thuban.h +1 -1
@@ -39,6 +39,6 @@"preboot=draco_led 0\0" \CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \CONFIG_ENV_SETTINGS_V2 \ - CONFIG_ENV_SETTINGS_NAND_V2 + CFG_ENV_SETTINGS_NAND_V2#endif /* ! __CONFIG_THUBAN_H */
Signature · 1 line
2.25.1
PATCH 19/149 global: Migrate CONFIG_ENV_SETTINGS_V1 to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_ENV_SETTINGS_V1 to CFG_ENV_SETTINGS_V1
--- include/configs/pxm2.h | 2 +- include/configs/rut.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
include/configs/pxm2.h +1 -1
@@ -36,7 +36,7 @@"preboot=draco_led 0\0" \CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \"splashpos=m,m\0" \ -CONFIG_ENV_SETTINGS_V1 \ +CFG_ENV_SETTINGS_V1 \CFG_ENV_SETTINGS_NAND_V1 \"mmc_dev=0\0" \"mmc_root=/dev/mmcblk0p2 rw\0" \
include/configs/rut.h +1 -1
@@ -33,7 +33,7 @@"nand_img_size=0x500000\0" \"splashpos=m,m\0" \"optargs=fixrtc --no-log consoleblank=0 \0" \ -CONFIG_ENV_SETTINGS_V1 \ +CFG_ENV_SETTINGS_V1 \CFG_ENV_SETTINGS_NAND_V1 \"mmc_dev=0\0" \"mmc_root=/dev/mmcblk0p2 rw\0" \
include/configs/siemens-am33x-common.h +1 -1
@@ -229,7 +229,7 @@"${nand_img_size}; bootm ${kloadaddr}\0" \COMMON_ENV_NAND_CMDS -#define CONFIG_ENV_SETTINGS_V1 \ +#define CFG_ENV_SETTINGS_V1 \COMMON_ENV_SETTINGS \"net_args=run bootargs_defaults;" \"mtdparts default;" \
Signature · 1 line
2.25.1
PATCH 20/149 global: Migrate CONFIG_ENV_SETTINGS_V2 to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_ENV_SETTINGS_V2 to CFG_ENV_SETTINGS_V2
--- include/configs/draco.h | 2 +- include/configs/etamin.h | 2 +- include/configs/rastaban.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/thuban.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
include/configs/draco.h +1 -1
@@ -35,7 +35,7 @@"optargs=\0" \"preboot=draco_led 0\0" \CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ -CONFIG_ENV_SETTINGS_V2 \ +CFG_ENV_SETTINGS_V2 \ CFG_ENV_SETTINGS_NAND_V2#endif /* ! __CONFIG_DRACO_H */
include/configs/etamin.h +1 -1
@@ -135,7 +135,7 @@"optargs=\0" \"preboot=draco_led 0\0" \CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ -CONFIG_ENV_SETTINGS_V2 \ +CFG_ENV_SETTINGS_V2 \ CFG_ENV_SETTINGS_NAND_V2#endif /* ! __CONFIG_ETAMIN_H */
include/configs/rastaban.h +1 -1
@@ -45,7 +45,7 @@"optargs=\0" \"preboot=draco_led 0\0" \CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ -CONFIG_ENV_SETTINGS_V2 \ +CFG_ENV_SETTINGS_V2 \ CFG_ENV_SETTINGS_NAND_V2#endif /* ! __CONFIG_RASTABAN_H */
include/configs/siemens-am33x-common.h +1 -1
@@ -306,7 +306,7 @@"bootm ${kloadaddr} - ${loadaddr}\0" \COMMON_ENV_NAND_CMDS -#define CONFIG_ENV_SETTINGS_V2 \ +#define CFG_ENV_SETTINGS_V2 \COMMON_ENV_SETTINGS \"net_args=run bootargs_defaults;" \"mtdparts default;" \
include/configs/thuban.h +1 -1
@@ -38,7 +38,7 @@"optargs=\0" \"preboot=draco_led 0\0" \CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ -CONFIG_ENV_SETTINGS_V2 \ +CFG_ENV_SETTINGS_V2 \ CFG_ENV_SETTINGS_NAND_V2#endif /* ! __CONFIG_THUBAN_H */
Signature · 1 line
2.25.1
PATCH 21/149 global: Migrate CONFIG_ENV_SROM_BANK to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_ENV_SROM_BANK to CFG_ENV_SROM_BANK
--- board/samsung/smdkc100/smdkc100.c | 6 +++--- board/samsung/smdkv310/smdkv310.c | 6 +++--- include/configs/exynos5-common.h | 2 +- include/configs/smdkc100.h | 2 +- include/configs/smdkv310.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-)
board/samsung/smdkc100/smdkc100.c +3 -3
@@ -25,16 +25,16 @@ static void smc9115_pre_init(void)u32 smc_bw_conf, smc_bc_conf;/* gpio configuration GPK0CON */ -gpio_cfg_pin (S5PC100_GPIO_K00 +CONFIG_ENV_SROM_BANK ,S5P_GPIO_FUNC (2 )); +gpio_cfg_pin (S5PC100_GPIO_K00 +CFG_ENV_SROM_BANK ,S5P_GPIO_FUNC (2 ));/* Ethernet needs bus width of 16 bits */ - smc_bw_conf =SMC_DATA16_WIDTH (CONFIG_ENV_SROM_BANK ); + smc_bw_conf =SMC_DATA16_WIDTH (CFG_ENV_SROM_BANK ); smc_bc_conf =SMC_BC_TACS (0x0 ) |SMC_BC_TCOS (0x4 ) |SMC_BC_TACC (0xe ) |SMC_BC_TCOH (0x1 ) |SMC_BC_TAH (0x4 ) |SMC_BC_TACP (0x6 ) |SMC_BC_PMC (0x0 );/* Select and configure the SROMC bank */ -s5p_config_sromc (CONFIG_ENV_SROM_BANK , smc_bw_conf, smc_bc_conf); +s5p_config_sromc (CFG_ENV_SROM_BANK , smc_bw_conf, smc_bc_conf); }int board_init (void )
board/samsung/smdkv310/smdkv310.c +3 -3
@@ -24,17 +24,17 @@ static void smc9115_pre_init(void)u32 smc_bw_conf, smc_bc_conf;/* gpio configuration GPK0CON */ -gpio_cfg_pin (EXYNOS4_GPIO_Y00 +CONFIG_ENV_SROM_BANK ,S5P_GPIO_FUNC (2 )); +gpio_cfg_pin (EXYNOS4_GPIO_Y00 +CFG_ENV_SROM_BANK ,S5P_GPIO_FUNC (2 ));/* Ethernet needs bus width of 16 bits */ - smc_bw_conf =SROMC_DATA16_WIDTH (CONFIG_ENV_SROM_BANK ); + smc_bw_conf =SROMC_DATA16_WIDTH (CFG_ENV_SROM_BANK ); smc_bc_conf =SROMC_BC_TACS (0x0F ) |SROMC_BC_TCOS (0x0F ) |SROMC_BC_TACC (0x0F ) |SROMC_BC_TCOH (0x0F ) |SROMC_BC_TAH (0x0F ) |SROMC_BC_TACP (0x0F ) |SROMC_BC_PMC (0x0F );/* Select and configure the SROMC bank */ -s5p_config_sromc (CONFIG_ENV_SROM_BANK , smc_bw_conf, smc_bc_conf); +s5p_config_sromc (CFG_ENV_SROM_BANK , smc_bw_conf, smc_bc_conf); }int board_init (void )
include/configs/exynos5-common.h +1 -1
@@ -48,7 +48,7 @@/* Ethernet Controllor Driver */ #ifdef CONFIG_CMD_NET -#define CONFIG_ENV_SROM_BANK 1 +#define CFG_ENV_SROM_BANK 1#endif /*CONFIG_CMD_NET*/ /* Enable Time Command */
include/configs/smdkc100.h +1 -1
@@ -94,7 +94,7 @@* Ethernet Contoller driver */ #ifdef CONFIG_CMD_NET -#define CONFIG_ENV_SROM_BANK 3/* Select SROM Bank-3 for Ethernet*/ +#define CFG_ENV_SROM_BANK 3/* Select SROM Bank-3 for Ethernet*/ #endif /* CONFIG_CMD_NET */ #endif /* __CONFIG_H */
include/configs/smdkv310.h +1 -1
@@ -36,7 +36,7 @@/* Ethernet Controllor Driver */ #ifdef CONFIG_CMD_NET -#define CONFIG_ENV_SROM_BANK 1 +#define CFG_ENV_SROM_BANK 1#endif /*CONFIG_CMD_NET*/ #endif /* __CONFIG_H */
Signature · 1 line
2.25.1
PATCH 22/149 global: Migrate CONFIG_ENV_TOTAL_SIZE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_ENV_TOTAL_SIZE to CFG_ENV_TOTAL_SIZE
--- include/configs/km/pg-wcom-ls102xa.h | 8 ++++---- include/configs/kmcent2.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
include/configs/km/pg-wcom-ls102xa.h +4 -4
@@ -169,7 +169,7 @@* Environment */ -#define CONFIG_ENV_TOTAL_SIZE 0x40000 +#define CFG_ENV_TOTAL_SIZE 0x40000#define ENV_DEL_ADDR CONFIG_ENV_ADDR_REDUND/* direct for newenv */ #ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */
@@ -208,11 +208,11 @@#define CONFIG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "protect on " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0" + " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"#define CONFIG_HW_ENV_SETTINGS \ "hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi," \
include/configs/kmcent2.h +4 -4
@@ -138,7 +138,7 @@#define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS/* Environment in parallel NOR-Flash */ -#define CONFIG_ENV_TOTAL_SIZE 0x040000 +#define CFG_ENV_TOTAL_SIZE 0x040000#define ENV_DEL_ADDR 0xebf00000/*direct for newenv*/ /*
@@ -428,11 +428,11 @@ int get_scl(void);#define CONFIG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "protect on " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0" + " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"/* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */ #ifndef CONFIG_KM_DEF_ARCH
Signature · 1 line
2.25.1
PATCH 23/149 global: Migrate CONFIG_ET1100_BASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_ET1100_BASE to CFG_ET1100_BASE
--- board/esd/meesc/meesc.c | 2 +- include/configs/meesc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
board/esd/meesc/meesc.c +1 -1
@@ -163,7 +163,7 @@ int checkboard(void)u_char hw_type;/* hardware type */ /* read the "Type" register of the ET1100 controller */ - hw_type =readb (CONFIG_ET1100_BASE ); + hw_type =readb (CFG_ET1100_BASE );switch (hw_type) {case 0x11 :
include/configs/meesc.h +1 -1
@@ -60,6 +60,6 @@#endif /* hw-controller addresses */ -#define CONFIG_ET1100_BASE 0x70000000 +#define CFG_ET1100_BASE 0x70000000#endif
Signature · 1 line
2.25.1
PATCH 24/149 global: Migrate CONFIG_ETHBASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_ETHBASE to CFG_ETHBASE
--- board/cadence/xtfpga/xtfpga.c | 2 +- include/configs/xtfpga.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
board/cadence/xtfpga/xtfpga.c +1 -1
@@ -89,7 +89,7 @@ int misc_init_r(void)char *s =env_get ("ethaddr" );if (s ==0 ) {unsigned int x; -char s[] =__stringify (CONFIG_ETHBASE ); +char s[] =__stringify (CFG_ETHBASE ); x = (*(volatile u32 *)CFG_SYS_FPGAREG_DIPSW ) &FPGAREG_MAC_MASK ;sprintf (&s[15 ],"%02x" , x);
include/configs/xtfpga.h +1 -1
@@ -120,7 +120,7 @@/* Ethernet Driver Info */ /*======================*/ -#define CONFIG_ETHBASE 00:50:C2:13:6f:00 +#define CFG_ETHBASE 00:50:C2:13:6f:00#define CFG_SYS_ETHOC_BASE IOADDR(0x0d030000)#define CFG_SYS_ETHOC_BUFFER_ADDR IOADDR(0x0D800000)
Signature · 1 line
2.25.1