power: pmic: Guard non-DM_PMIC drivers with a check for POWER_LEGACY
Subsystems (59)
PATCH 176/241 global: Migrate CONFIG_SERVERIP to CFG
In reply to Tom Rini--- README | 2 +- doc/README.usb | 2 +- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5282EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/MCR3000.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/apalis-imx8.h | 2 +- include/configs/apalis-tk1.h | 4 ++-- include/configs/apalis_imx6.h | 4 ++-- include/configs/cobra5272.h | 2 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri-imx8x.h | 2 +- include/configs/colibri_imx6.h | 4 ++-- include/configs/colibri_imx7.h | 2 +- include/configs/colibri_vf.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/integratorcp.h | 2 +- include/configs/mt7622.h | 2 +- include/configs/mt7623.h | 2 +- include/configs/mt7629.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/poleg.h | 2 +- include/configs/stm32mp15_common.h | 2 +- include/configs/uniphier.h | 2 +- include/env_default.h | 4 ++-- net/bootp.c | 10 +++++----- scripts/config_whitelist.txt | 2 +- 32 files changed, 40 insertions(+), 40 deletions(-)
README +1 -1
@@ -743,7 +743,7 @@ The following options need to be configured: (Environment variable "ipaddr") - Server IP address: - CONFIG_SERVERIP + CFG_SERVERIP Defines a default value for the IP address of a TFTP server to contact when using the "tftboot" command.
doc/README.usb +1 -1
@@ -163,7 +163,7 @@ and all the parameters can either get stored in the board's external environment, or get obtained from the bootp server if not set. #define CFG_IPADDR 10.0.0.2 (replace with your value) -#define CONFIG_SERVERIP 10.0.0.1 (replace with your value) +#define CFG_SERVERIP 10.0.0.1 (replace with your value) #define CONFIG_BOOTFILE "uImage" The 'usb start' command should identify the adapter something like this:
include/configs/M5208EVBE.h +1 -1
@@ -20,7 +20,7 @@#ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2# define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1# define CFG_GATEWAYIP 192.162.1.1#endif /* CONFIG_MCFFEC */
include/configs/M5235EVB.h +1 -1
@@ -29,7 +29,7 @@#ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2# define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1# define CFG_GATEWAYIP 192.162.1.1#endif /* FEC_ENET */
include/configs/M5272C3.h +1 -1
@@ -32,7 +32,7 @@#ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2# define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1# define CFG_GATEWAYIP 192.162.1.1#endif /* CONFIG_MCFFEC */
include/configs/M5282EVB.h +1 -1
@@ -32,7 +32,7 @@#ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2# define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1# define CFG_GATEWAYIP 192.162.1.1#endif /* CONFIG_MCFFEC */
include/configs/M53017EVB.h +1 -1
@@ -33,7 +33,7 @@#ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2# define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1# define CFG_GATEWAYIP 192.162.1.1#endif /* FEC_ENET */
include/configs/M5329EVB.h +1 -1
@@ -25,7 +25,7 @@#ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2# define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1# define CFG_GATEWAYIP 192.162.1.1#endif /* FEC_ENET */
include/configs/M5373EVB.h +1 -1
@@ -27,7 +27,7 @@#ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2# define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1# define CFG_GATEWAYIP 192.162.1.1#endif /* FEC_ENET */
include/configs/MCR3000.h +1 -1
@@ -53,7 +53,7 @@ "bootm ${loadaddr} - 0xf00000\0"#define CFG_IPADDR 192.168.0.3 -#define CONFIG_SERVERIP 192.168.0.1 +#define CFG_SERVERIP 192.168.0.1#define CFG_NETMASK 255.0.0.0/* Miscellaneous configurable options */
include/configs/MPC8548CDS.h +1 -1
@@ -331,7 +331,7 @@#define CFG_ROOTPATH "/nfsroot"#define CONFIG_UBOOTPATH 8548cds/u-boot.bin/* TFTP server */ -#define CONFIG_SERVERIP 192.168.1.1 +#define CFG_SERVERIP 192.168.1.1#define CFG_GATEWAYIP 192.168.1.1#define CFG_NETMASK 255.255.255.0
include/configs/apalis-imx8.h +1 -1
@@ -16,7 +16,7 @@/* Networking */ #define CFG_IPADDR 192.168.10.2#define CFG_NETMASK 255.255.255.0 -#define CONFIG_SERVERIP 192.168.10.1 +#define CFG_SERVERIP 192.168.10.1#define MEM_LAYOUT_ENV_SETTINGS \ "fdt_addr_r=0x84000000\0" \
include/configs/apalis-tk1.h +2 -2
@@ -36,8 +36,8 @@#undef CFG_IPADDR#define CFG_IPADDR 192.168.10.2#define CFG_NETMASK 255.255.255.0 -#undef CONFIG_SERVERIP -#define CONFIG_SERVERIP 192.168.10.1 +#undef CFG_SERVERIP +#define CFG_SERVERIP 192.168.10.1#define DFU_ALT_EMMC_INFO "apalis-tk1.img raw 0x0 0x500 mmcpart 1; " \ "boot part 0 1 mmcpart 0; " \
include/configs/apalis_imx6.h +2 -2
@@ -38,8 +38,8 @@#undef CFG_IPADDR#define CFG_IPADDR 192.168.10.2#define CFG_NETMASK 255.255.255.0 -#undef CONFIG_SERVERIP -#define CONFIG_SERVERIP 192.168.10.1 +#undef CFG_SERVERIP +#define CFG_SERVERIP 192.168.10.1#define BOOT_TARGET_DEVICES (func) \ func(MMC, mmc, 1) \
include/configs/cobra5272.h +1 -1
@@ -71,7 +71,7 @@ enter a valid image address in flash *//* User network settings */ #define CFG_IPADDR 192.168.100.2/* default board IP address */ -#define CONFIG_SERVERIP 192.168.100.1/* default tftp server IP address */ +#define CFG_SERVERIP 192.168.100.1/* default tftp server IP address */ #endif
include/configs/colibri-imx6ull.h +1 -1
@@ -22,7 +22,7 @@#define CFG_IPADDR 192.168.10.2#define CFG_NETMASK 255.255.255.0 -#define CONFIG_SERVERIP 192.168.10.1 +#define CFG_SERVERIP 192.168.10.1#if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC )#define UBOOT_UPDATE \
include/configs/colibri-imx8x.h +1 -1
@@ -16,7 +16,7 @@#define CFG_IPADDR 192.168.10.2#define CFG_NETMASK 255.255.255.0 -#define CONFIG_SERVERIP 192.168.10.1 +#define CFG_SERVERIP 192.168.10.1#define MEM_LAYOUT_ENV_SETTINGS \ "fdt_addr_r=0x83000000\0" \
include/configs/colibri_imx6.h +2 -2
@@ -33,8 +33,8 @@#undef CFG_IPADDR#define CFG_IPADDR 192.168.10.2#define CFG_NETMASK 255.255.255.0 -#undef CONFIG_SERVERIP -#define CONFIG_SERVERIP 192.168.10.1 +#undef CFG_SERVERIP +#define CFG_SERVERIP 192.168.10.1#define BOOT_TARGET_DEVICES (func) \ func(MMC, mmc, 1) \
include/configs/colibri_imx7.h +1 -1
@@ -23,7 +23,7 @@#define CFG_IPADDR 192.168.10.2#define CFG_NETMASK 255.255.255.0 -#define CONFIG_SERVERIP 192.168.10.1 +#define CFG_SERVERIP 192.168.10.1#if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC )#define UBOOT_UPDATE \
include/configs/colibri_vf.h +1 -1
@@ -18,7 +18,7 @@#define CFG_IPADDR 192.168.10.2#define CFG_NETMASK 255.255.255.0 -#define CONFIG_SERVERIP 192.168.10.1 +#define CFG_SERVERIP 192.168.10.1#define CFG_FDTADDR 0x84000000
include/configs/gw_ventana.h +1 -1
@@ -58,6 +58,6 @@/* Environment */ #define CFG_IPADDR 192.168.1.1 -#define CONFIG_SERVERIP 192.168.1.146 +#define CFG_SERVERIP 192.168.1.146#endif /* __CONFIG_H */
include/configs/integratorcp.h +1 -1
@@ -19,7 +19,7 @@/* Integrator CP-specific configuration */ #define CFG_SYS_HZ_CLOCK 1000000/* Timer 1 is clocked at 1Mhz */ -#define CONFIG_SERVERIP 192.168.1.100 +#define CFG_SERVERIP 192.168.1.100#define CFG_IPADDR 192.168.1.104/*
include/configs/mt7622.h +1 -1
@@ -19,6 +19,6 @@/* Ethernet */ #define CFG_IPADDR 192.168.1.1 -#define CONFIG_SERVERIP 192.168.1.3 +#define CFG_SERVERIP 192.168.1.3#endif
include/configs/mt7623.h +1 -1
@@ -34,7 +34,7 @@/* Ethernet */ #define CFG_IPADDR 192.168.1.1 -#define CONFIG_SERVERIP 192.168.1.2 +#define CFG_SERVERIP 192.168.1.2#ifdef CONFIG_DISTRO_DEFAULTS
include/configs/mt7629.h +1 -1
@@ -29,6 +29,6 @@/* Ethernet */ #define CFG_IPADDR 192.168.1.1 -#define CONFIG_SERVERIP 192.168.1.2 +#define CFG_SERVERIP 192.168.1.2#endif
include/configs/mvebu_alleycat-5.h +1 -1
@@ -16,7 +16,7 @@/* Default Env vars */ #define CFG_IPADDR 0.0.0.0/* In order to cause an error */ -#define CONFIG_SERVERIP 0.0.0.0/* In order to cause an error */ +#define CFG_SERVERIP 0.0.0.0/* In order to cause an error */ #define CFG_NETMASK 255.255.255.0#define CFG_GATEWAYIP 0.0.0.0#define CFG_ROOTPATH "/srv/nfs/"/* Default Dir for NFS */
include/configs/poleg.h +1 -1
@@ -14,7 +14,7 @@#define CFG_SYS_SDRAM_BASE 0x0/* Default environemnt variables */ -#define CONFIG_SERVERIP 192.168.0.1 +#define CFG_SERVERIP 192.168.0.1#define CFG_IPADDR 192.168.0.2#define CFG_NETMASK 255.255.255.0#define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \
include/configs/stm32mp15_common.h +1 -1
@@ -25,7 +25,7 @@/* Ethernet need */ #ifdef CONFIG_DWC_ETH_QOS -#define CONFIG_SERVERIP 192.168.1.1 +#define CFG_SERVERIP 192.168.1.1#endif #define STM32MP_FIP_IMAGE_GUID \
include/configs/uniphier.h +1 -1
@@ -46,7 +46,7 @@/* * Network Configuration */ -#define CONFIG_SERVERIP 192.168.11.1 +#define CFG_SERVERIP 192.168.11.1#define CFG_IPADDR 192.168.11.10#define CFG_GATEWAYIP 192.168.11.1#define CFG_NETMASK 255.255.255.0
include/env_default.h +2 -2
@@ -56,8 +56,8 @@ const char default_environment[] = {#ifdef CFG_IPADDR "ipaddr=" __stringify(CFG_IPADDR) "\0"#endif -#ifdef CONFIG_SERVERIP - "serverip=" __stringify(CONFIG_SERVERIP) "\0" +#ifdef CFG_SERVERIP + "serverip=" __stringify(CFG_SERVERIP) "\0"#endif #ifdef CONFIG_SYS_DISABLE_AUTOLOAD "autoload=0\0"
net/bootp.c +5 -5
@@ -183,7 +183,7 @@ static void store_bootp_params(struct bootp_hdr *bp)*/ static void store_net_params (struct bootp_hdr *bp) { -#if !defined(CONFIG_SERVERIP_FROM_PROXYDHCP ) +#if !defined(CFG_SERVERIP_FROM_PROXYDHCP )store_bootp_params (bp);#endif net_copy_ip (&net_ip, &bp->bp_yiaddr);
@@ -1056,7 +1056,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, "%d\n", src, dest, len, dhcp_state);if (net_read_ip (&bp->bp_yiaddr).s_addr ==0 ) { -#if defined(CONFIG_SERVERIP_FROM_PROXYDHCP ) +#if defined(CFG_SERVERIP_FROM_PROXYDHCP )store_bootp_params (bp);#endif return ;
@@ -1081,11 +1081,11 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, CONFIG_IS_ENABLED(NET_DEVICES))efi_net_set_dhcp_ack (pkt, len); -#if defined(CONFIG_SERVERIP_FROM_PROXYDHCP ) +#if defined(CFG_SERVERIP_FROM_PROXYDHCP )if (!net_server_ip.s_addr) -udelay (CONFIG_SERVERIP_FROM_PROXYDHCP_DELAY_MS * +udelay (CFG_SERVERIP_FROM_PROXYDHCP_DELAY_MS *1000 ); -#endif /* CONFIG_SERVERIP_FROM_PROXYDHCP */ +#endif /* CFG_SERVERIP_FROM_PROXYDHCP */ debug ("TRANSITIONING TO REQUESTING STATE\n" ); dhcp_state =REQUESTING ;
scripts/config_whitelist.txt +1 -1
@@ -185,7 +185,7 @@ CFG_SCIF_A CFG_SCSI_DEV_LIST CFG_SC_TIMER_CLK CFG_SERIAL_BOOT -CONFIG_SERVERIP +CFG_SERVERIP CONFIG_SETUP_INITRD_TAG CONFIG_SET_DFU_ALT_BUF_LEN CONFIG_SH_ETHER_ALIGNE_SIZE
Signature · 1 line
2.25.1
PATCH 177/241 global: Migrate CONFIG_SETUP_INITRD_TAG to CFG
In reply to Tom Rini--- include/configs/legoev3.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/legoev3.h +1 -1
@@ -48,7 +48,7 @@* Linux Information */ #define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100) -#define CONFIG_SETUP_INITRD_TAG +#define CFG_SETUP_INITRD_TAG #define CFG_EXTRA_ENV_SETTINGS \ "bootenvfile=uEnv.txt\0" \ "fdtfile=da850-lego-ev3.dtb\0" \
scripts/config_whitelist.txt +1 -1
@@ -186,7 +186,7 @@ CFG_SCSI_DEV_LIST CFG_SC_TIMER_CLK CFG_SERIAL_BOOT CFG_SERVERIP -CONFIG_SETUP_INITRD_TAG +CFG_SETUP_INITRD_TAG CONFIG_SET_DFU_ALT_BUF_LEN CONFIG_SH_ETHER_ALIGNE_SIZE CONFIG_SH_ETHER_CACHE_INVALIDATE
Signature · 1 line
2.25.1
PATCH 178/241 global: Migrate CONFIG_SET_DFU_ALT_BUF_LEN to CFG
In reply to Tom Rini--- board/samsung/common/misc.c | 2 +- include/configs/odroid.h | 2 +- include/configs/odroid_xu3.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
board/samsung/common/misc.c +1 -1
@@ -41,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR;#ifdef CONFIG_SET_DFU_ALT_INFO void set_dfu_alt_info (char *interface,char *devstr) { -size_t buf_size =CONFIG_SET_DFU_ALT_BUF_LEN ; +size_t buf_size =CFG_SET_DFU_ALT_BUF_LEN ;ALLOC_CACHE_ALIGN_BUFFER (char, buf, buf_size);char *alt_info ="Settings not found!" ;char *status ="error!\n" ;
include/configs/odroid.h +1 -1
@@ -37,7 +37,7 @@"" PARTS_BOOT " part 0 1;" \ ""PARTS_ROOT" part 0 2\0" \ -#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) +#define CFG_SET_DFU_ALT_BUF_LEN (SZ_1K)#define CFG_DFU_ALT_BOOT_EMMC \ "u-boot raw 0x3e 0x800 mmcpart 1;" \
include/configs/odroid_xu3.h +1 -1
@@ -57,7 +57,7 @@"params.bin raw 0x1880 0x20\0" /* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */ -#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) +#define CFG_SET_DFU_ALT_BUF_LEN (SZ_1K)/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ #define CFG_ODROID_REV_AIN 9
scripts/config_whitelist.txt +1 -1
@@ -187,7 +187,7 @@ CFG_SC_TIMER_CLK CFG_SERIAL_BOOT CFG_SERVERIP CFG_SETUP_INITRD_TAG -CONFIG_SET_DFU_ALT_BUF_LEN +CFG_SET_DFU_ALT_BUF_LEN CONFIG_SH_ETHER_ALIGNE_SIZE CONFIG_SH_ETHER_CACHE_INVALIDATE CONFIG_SH_ETHER_CACHE_WRITEBACK
Signature · 1 line
2.25.1
PATCH 179/241 global: Migrate CONFIG_SH_ETHER_ALIGNE_SIZE to CFG
In reply to Tom Rini--- drivers/net/sh_eth.c | 4 ++-- drivers/net/sh_eth.h | 16 ++++++++-------- include/configs/alt.h | 2 +- include/configs/condor.h | 2 +- include/configs/gose.h | 2 +- include/configs/grpeach.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/lager.h | 2 +- include/configs/porter.h | 2 +- include/configs/silk.h | 2 +- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-)
drivers/net/sh_eth.c +2 -2
@@ -43,7 +43,7 @@ !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)#define flush_cache_wback (addr, len) \ flush_dcache_range((unsigned long)addr, \ - (unsigned long)(addr + ALIGN(len, CONFIG_SH_ETHER_ALIGNE_SIZE))) + (unsigned long)(addr + ALIGN(len, CFG_SH_ETHER_ALIGNE_SIZE)))#else #define flush_cache_wback (...)#endif
@@ -51,7 +51,7 @@#if defined(CONFIG_SH_ETHER_CACHE_INVALIDATE ) && defined(CONFIG_ARM )#define invalidate_cache (addr, len) \ { \ - unsigned long line_size = CONFIG_SH_ETHER_ALIGNE_SIZE; \ + unsigned long line_size = CFG_SH_ETHER_ALIGNE_SIZE; \ unsigned long start, end; \ \ start = (unsigned long)addr; \
drivers/net/sh_eth.h +8 -8
@@ -29,8 +29,8 @@#endif /* defined(CONFIG_SH) */ /* base padding size is 16 */ -#ifndef CONFIG_SH_ETHER_ALIGNE_SIZE -#define CONFIG_SH_ETHER_ALIGNE_SIZE 16 +#ifndef CFG_SH_ETHER_ALIGNE_SIZE +#define CFG_SH_ETHER_ALIGNE_SIZE 16#endif /* Number of supported ports */
@@ -47,7 +47,7 @@/* The size of the tx descriptor is determined by how much padding is used. 4, 20, or 52 bytes of padding can be used */ -#define TX_DESC_PADDING (CONFIG_SH_ETHER_ALIGNE_SIZE - 12) +#define TX_DESC_PADDING (CFG_SH_ETHER_ALIGNE_SIZE - 12)/* Tx descriptor. We always use 3 bytes of padding */ struct tx_desc_s {
@@ -62,9 +62,9 @@ struct tx_desc_s {/* The size of the rx descriptor is determined by how much padding is used. 4, 20, or 52 bytes of padding can be used */ -#define RX_DESC_PADDING (CONFIG_SH_ETHER_ALIGNE_SIZE - 12) +#define RX_DESC_PADDING (CFG_SH_ETHER_ALIGNE_SIZE - 12)/* aligned cache line size */ -#define RX_BUF_ALIGNE_SIZE (CONFIG_SH_ETHER_ALIGNE_SIZE > 32 ? 64 : 32) +#define RX_BUF_ALIGNE_SIZE (CFG_SH_ETHER_ALIGNE_SIZE > 32 ? 64 : 32)/* Rx descriptor. We always use 4 bytes of padding */ struct rx_desc_s {
@@ -388,11 +388,11 @@ enum DMAC_M_BIT {#endif }; -#if CONFIG_SH_ETHER_ALIGNE_SIZE ==64 +#if CFG_SH_ETHER_ALIGNE_SIZE ==64 # define EMDR_DESC EDMR_DL1 -#elif CONFIG_SH_ETHER_ALIGNE_SIZE ==32 +#elif CFG_SH_ETHER_ALIGNE_SIZE ==32 # define EMDR_DESC EDMR_DL0 -#elif CONFIG_SH_ETHER_ALIGNE_SIZE ==16 /* Default */ +#elif CFG_SH_ETHER_ALIGNE_SIZE ==16 /* Default */ # define EMDR_DESC 0#endif
include/configs/alt.h +1 -1
@@ -29,7 +29,7 @@#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_SH_ETHER_ALIGNE_SIZE 64 +#define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/condor.h +1 -1
@@ -19,7 +19,7 @@#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_SH_ETHER_ALIGNE_SIZE 64 +#define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */ /* XTAL_CLK : 33.33MHz */
include/configs/gose.h +1 -1
@@ -25,7 +25,7 @@#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_SH_ETHER_ALIGNE_SIZE 64 +#define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/grpeach.h +1 -1
@@ -22,6 +22,6 @@#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII#define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_SH_ETHER_ALIGNE_SIZE 64 +#define CFG_SH_ETHER_ALIGNE_SIZE 64#endif /* __GRPEACH_H */
include/configs/koelsch.h +1 -1
@@ -25,7 +25,7 @@#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_SH_ETHER_ALIGNE_SIZE 64 +#define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/lager.h +1 -1
@@ -26,7 +26,7 @@#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_SH_ETHER_ALIGNE_SIZE 64 +#define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/porter.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_SH_ETHER_ALIGNE_SIZE 64 +#define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/silk.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_SH_ETHER_ALIGNE_SIZE 64 +#define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/stout.h +1 -1
@@ -34,7 +34,7 @@#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK #define CONFIG_SH_ETHER_CACHE_INVALIDATE -#define CONFIG_SH_ETHER_ALIGNE_SIZE 64 +#define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
scripts/config_whitelist.txt +1 -1
@@ -188,7 +188,7 @@ CFG_SERIAL_BOOT CFG_SERVERIP CFG_SETUP_INITRD_TAG CFG_SET_DFU_ALT_BUF_LEN -CONFIG_SH_ETHER_ALIGNE_SIZE +CFG_SH_ETHER_ALIGNE_SIZE CONFIG_SH_ETHER_CACHE_INVALIDATE CONFIG_SH_ETHER_CACHE_WRITEBACK CONFIG_SH_ETHER_PHY_ADDR
Signature · 1 line
2.25.1
PATCH 180/241 global: Migrate CONFIG_SH_ETHER_CACHE_INVALIDATE to CFG
In reply to Tom Rini--- drivers/net/sh_eth.c | 2 +- include/configs/alt.h | 2 +- include/configs/condor.h | 2 +- include/configs/gose.h | 2 +- include/configs/grpeach.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/lager.h | 2 +- include/configs/porter.h | 2 +- include/configs/silk.h | 2 +- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)
drivers/net/sh_eth.c +1 -1
@@ -48,7 +48,7 @@#define flush_cache_wback (...)#endif -#if defined(CONFIG_SH_ETHER_CACHE_INVALIDATE ) && defined(CONFIG_ARM ) +#if defined(CFG_SH_ETHER_CACHE_INVALIDATE ) && defined(CONFIG_ARM )#define invalidate_cache (addr, len) \ { \ unsigned long line_size = CFG_SH_ETHER_ALIGNE_SIZE; \
include/configs/alt.h +1 -1
@@ -28,7 +28,7 @@#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK -#define CONFIG_SH_ETHER_CACHE_INVALIDATE +#define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/condor.h +1 -1
@@ -18,7 +18,7 @@#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK -#define CONFIG_SH_ETHER_CACHE_INVALIDATE +#define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/gose.h +1 -1
@@ -24,7 +24,7 @@#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK -#define CONFIG_SH_ETHER_CACHE_INVALIDATE +#define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/grpeach.h +1 -1
@@ -21,7 +21,7 @@#define CONFIG_SH_ETHER_PHY_ADDR 0#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII#define CONFIG_SH_ETHER_CACHE_WRITEBACK -#define CONFIG_SH_ETHER_CACHE_INVALIDATE +#define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64#endif /* __GRPEACH_H */
include/configs/koelsch.h +1 -1
@@ -24,7 +24,7 @@#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK -#define CONFIG_SH_ETHER_CACHE_INVALIDATE +#define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/lager.h +1 -1
@@ -25,7 +25,7 @@#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK -#define CONFIG_SH_ETHER_CACHE_INVALIDATE +#define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/porter.h +1 -1
@@ -29,7 +29,7 @@#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK -#define CONFIG_SH_ETHER_CACHE_INVALIDATE +#define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/silk.h +1 -1
@@ -29,7 +29,7 @@#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK -#define CONFIG_SH_ETHER_CACHE_INVALIDATE +#define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
include/configs/stout.h +1 -1
@@ -33,7 +33,7 @@#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CONFIG_SH_ETHER_CACHE_WRITEBACK -#define CONFIG_SH_ETHER_CACHE_INVALIDATE +#define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64/* Board Clock */
scripts/config_whitelist.txt +1 -1
@@ -189,7 +189,7 @@ CFG_SERVERIP CFG_SETUP_INITRD_TAG CFG_SET_DFU_ALT_BUF_LEN CFG_SH_ETHER_ALIGNE_SIZE -CONFIG_SH_ETHER_CACHE_INVALIDATE +CFG_SH_ETHER_CACHE_INVALIDATE CONFIG_SH_ETHER_CACHE_WRITEBACK CONFIG_SH_ETHER_PHY_ADDR CONFIG_SH_ETHER_PHY_MODE
Signature · 1 line
2.25.1
PATCH 181/241 global: Migrate CONFIG_SH_ETHER_CACHE_WRITEBACK to CFG
In reply to Tom Rini--- README | 2 +- drivers/net/sh_eth.c | 2 +- include/configs/alt.h | 2 +- include/configs/condor.h | 2 +- include/configs/gose.h | 2 +- include/configs/grpeach.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/lager.h | 2 +- include/configs/porter.h | 2 +- include/configs/silk.h | 2 +- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)
README +1 -1
@@ -553,7 +553,7 @@ The following options need to be configured: CONFIG_SH_ETHER_PHY_ADDR Define the ETH PHY's address - CONFIG_SH_ETHER_CACHE_WRITEBACK + CFG_SH_ETHER_CACHE_WRITEBACK If this option is set, the driver enables cache flush. - TPM Support:
drivers/net/sh_eth.c +1 -1
@@ -39,7 +39,7 @@# error "Please define CONFIG_SH_ETHER_PHY_ADDR"#endif -#if defined(CONFIG_SH_ETHER_CACHE_WRITEBACK ) && \ +#if defined(CFG_SH_ETHER_CACHE_WRITEBACK ) && \ !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )#define flush_cache_wback (addr, len) \ flush_dcache_range((unsigned long)addr, \
include/configs/alt.h +1 -1
@@ -27,7 +27,7 @@#define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/condor.h +1 -1
@@ -17,7 +17,7 @@#define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/gose.h +1 -1
@@ -23,7 +23,7 @@#define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/grpeach.h +1 -1
@@ -20,7 +20,7 @@#define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/koelsch.h +1 -1
@@ -23,7 +23,7 @@#define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/lager.h +1 -1
@@ -24,7 +24,7 @@#define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/porter.h +1 -1
@@ -28,7 +28,7 @@#define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/silk.h +1 -1
@@ -28,7 +28,7 @@#define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/stout.h +1 -1
@@ -32,7 +32,7 @@#define CONFIG_SH_ETHER_USE_PORT 0#define CONFIG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
scripts/config_whitelist.txt +1 -1
@@ -190,7 +190,7 @@ CFG_SETUP_INITRD_TAG CFG_SET_DFU_ALT_BUF_LEN CFG_SH_ETHER_ALIGNE_SIZE CFG_SH_ETHER_CACHE_INVALIDATE -CONFIG_SH_ETHER_CACHE_WRITEBACK +CFG_SH_ETHER_CACHE_WRITEBACK CONFIG_SH_ETHER_PHY_ADDR CONFIG_SH_ETHER_PHY_MODE CONFIG_SH_ETHER_USE_PORT
Signature · 1 line
2.25.1
PATCH 182/241 global: Migrate CONFIG_SH_ETHER_PHY_ADDR to CFG
In reply to Tom Rini--- README | 2 +- drivers/net/sh_eth.c | 8 ++++---- include/configs/alt.h | 2 +- include/configs/condor.h | 2 +- include/configs/gose.h | 2 +- include/configs/grpeach.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/lager.h | 2 +- include/configs/porter.h | 2 +- include/configs/silk.h | 2 +- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-)
README +1 -1
@@ -550,7 +550,7 @@ The following options need to be configured: CONFIG_SH_ETHER_USE_PORT Define the number of ports to be used - CONFIG_SH_ETHER_PHY_ADDR + CFG_SH_ETHER_PHY_ADDR Define the ETH PHY's address CFG_SH_ETHER_CACHE_WRITEBACK
drivers/net/sh_eth.c +4 -4
@@ -35,8 +35,8 @@#ifndef CONFIG_SH_ETHER_USE_PORT # error "Please define CONFIG_SH_ETHER_USE_PORT"#endif -#ifndef CONFIG_SH_ETHER_PHY_ADDR -# error "Please define CONFIG_SH_ETHER_PHY_ADDR" +#ifndef CFG_SH_ETHER_PHY_ADDR +# error "Please define CFG_SH_ETHER_PHY_ADDR"#endif #if defined(CFG_SH_ETHER_CACHE_WRITEBACK) && \
@@ -636,7 +636,7 @@ int sh_eth_initialize(struct bd_info *bd)memset (eth,0 ,sizeof (struct sh_eth_dev )); eth->port =CONFIG_SH_ETHER_USE_PORT ; - eth->port_info[eth->port].phy_addr =CONFIG_SH_ETHER_PHY_ADDR ; + eth->port_info[eth->port].phy_addr =CFG_SH_ETHER_PHY_ADDR ; eth->port_info[eth->port].iobase = (void __iomem *)(BASE_IO_ADDR +0x800 * eth->port);
@@ -853,7 +853,7 @@ static int sh_ether_probe(struct udevice *udev) priv->bus =miiphy_get_dev_by_name (udev->name); eth->port =CONFIG_SH_ETHER_USE_PORT ; - eth->port_info[eth->port].phy_addr =CONFIG_SH_ETHER_PHY_ADDR ; + eth->port_info[eth->port].phy_addr =CFG_SH_ETHER_PHY_ADDR ; eth->port_info[eth->port].iobase = (void __iomem *)(uintptr_t )(BASE_IO_ADDR +0x800 * eth->port);
include/configs/alt.h +1 -1
@@ -25,7 +25,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE
include/configs/condor.h +1 -1
@@ -15,7 +15,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE
include/configs/gose.h +1 -1
@@ -21,7 +21,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE
include/configs/grpeach.h +1 -1
@@ -18,7 +18,7 @@/* Network interface */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0 +#define CFG_SH_ETHER_PHY_ADDR 0#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE
include/configs/koelsch.h +1 -1
@@ -21,7 +21,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE
include/configs/lager.h +1 -1
@@ -22,7 +22,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE
include/configs/porter.h +1 -1
@@ -26,7 +26,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE
include/configs/silk.h +1 -1
@@ -26,7 +26,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE
include/configs/stout.h +1 -1
@@ -30,7 +30,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE
scripts/config_whitelist.txt +1 -1
@@ -191,7 +191,7 @@ CFG_SET_DFU_ALT_BUF_LEN CFG_SH_ETHER_ALIGNE_SIZE CFG_SH_ETHER_CACHE_INVALIDATE CFG_SH_ETHER_CACHE_WRITEBACK -CONFIG_SH_ETHER_PHY_ADDR +CFG_SH_ETHER_PHY_ADDR CONFIG_SH_ETHER_PHY_MODE CONFIG_SH_ETHER_USE_PORT CONFIG_SH_QSPI_BASE
Signature · 1 line
2.25.1
PATCH 183/241 global: Migrate CONFIG_SH_ETHER_PHY_MODE to CFG
In reply to Tom Rini--- drivers/net/sh_eth.c | 2 +- include/configs/alt.h | 2 +- include/configs/condor.h | 2 +- include/configs/gose.h | 2 +- include/configs/grpeach.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/lager.h | 2 +- include/configs/porter.h | 2 +- include/configs/silk.h | 2 +- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)
drivers/net/sh_eth.c +1 -1
@@ -536,7 +536,7 @@ static int sh_eth_phy_config_legacy(struct sh_eth_dev *eth) phydev =phy_connect (miiphy_get_dev_by_name (dev->name), - port_info->phy_addr, dev,CONFIG_SH_ETHER_PHY_MODE ); + port_info->phy_addr, dev,CFG_SH_ETHER_PHY_MODE ); port_info->phydev = phydev;phy_config (phydev);
include/configs/alt.h +1 -1
@@ -26,7 +26,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/condor.h +1 -1
@@ -16,7 +16,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/gose.h +1 -1
@@ -22,7 +22,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/grpeach.h +1 -1
@@ -19,7 +19,7 @@/* Network interface */ #define CONFIG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/koelsch.h +1 -1
@@ -22,7 +22,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/lager.h +1 -1
@@ -23,7 +23,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/porter.h +1 -1
@@ -27,7 +27,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/silk.h +1 -1
@@ -27,7 +27,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
include/configs/stout.h +1 -1
@@ -31,7 +31,7 @@/* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64
scripts/config_whitelist.txt +1 -1
@@ -192,7 +192,7 @@ CFG_SH_ETHER_ALIGNE_SIZE CFG_SH_ETHER_CACHE_INVALIDATE CFG_SH_ETHER_CACHE_WRITEBACK CFG_SH_ETHER_PHY_ADDR -CONFIG_SH_ETHER_PHY_MODE +CFG_SH_ETHER_PHY_MODE CONFIG_SH_ETHER_USE_PORT CONFIG_SH_QSPI_BASE CONFIG_SLIC
Signature · 1 line
2.25.1
PATCH 184/241 global: Migrate CONFIG_SH_ETHER_USE_PORT to CFG
In reply to Tom Rini--- README | 2 +- drivers/net/sh_eth.c | 8 ++++---- include/configs/alt.h | 2 +- include/configs/condor.h | 2 +- include/configs/gose.h | 2 +- include/configs/grpeach.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/lager.h | 2 +- include/configs/porter.h | 2 +- include/configs/silk.h | 2 +- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-)
README +1 -1
@@ -547,7 +547,7 @@ The following options need to be configured: CONFIG_SH_ETHER Support for Renesas on-chip Ethernet controller - CONFIG_SH_ETHER_USE_PORT + CFG_SH_ETHER_USE_PORT Define the number of ports to be used CFG_SH_ETHER_PHY_ADDR
drivers/net/sh_eth.c +4 -4
@@ -32,8 +32,8 @@#include "sh_eth.h" -#ifndef CONFIG_SH_ETHER_USE_PORT -# error "Please define CONFIG_SH_ETHER_USE_PORT" +#ifndef CFG_SH_ETHER_USE_PORT +# error "Please define CFG_SH_ETHER_USE_PORT"#endif #ifndef CFG_SH_ETHER_PHY_ADDR # error "Please define CFG_SH_ETHER_PHY_ADDR"
@@ -635,7 +635,7 @@ int sh_eth_initialize(struct bd_info *bd)memset (dev,0 ,sizeof (struct eth_device ));memset (eth,0 ,sizeof (struct sh_eth_dev )); - eth->port =CONFIG_SH_ETHER_USE_PORT ; + eth->port =CFG_SH_ETHER_USE_PORT ; eth->port_info[eth->port].phy_addr =CFG_SH_ETHER_PHY_ADDR ; eth->port_info[eth->port].iobase = (void __iomem *)(BASE_IO_ADDR +0x800 * eth->port);
@@ -852,7 +852,7 @@ static int sh_ether_probe(struct udevice *udev) priv->bus =miiphy_get_dev_by_name (udev->name); - eth->port =CONFIG_SH_ETHER_USE_PORT ; + eth->port =CFG_SH_ETHER_USE_PORT ; eth->port_info[eth->port].phy_addr =CFG_SH_ETHER_PHY_ADDR ; eth->port_info[eth->port].iobase = (void __iomem *)(uintptr_t )(BASE_IO_ADDR +0x800 * eth->port);
include/configs/alt.h +1 -1
@@ -24,7 +24,7 @@#define CONFIG_SPI_FLASH_QUAD /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK
include/configs/condor.h +1 -1
@@ -14,7 +14,7 @@/* Environment compatibility */ /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK
include/configs/gose.h +1 -1
@@ -20,7 +20,7 @@#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512u * 1024 * 1024)/* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK
include/configs/grpeach.h +1 -1
@@ -17,7 +17,7 @@#define CFG_SYS_SDRAM_SIZE (10 * 1024 * 1024)/* Network interface */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII#define CFG_SH_ETHER_CACHE_WRITEBACK
include/configs/koelsch.h +1 -1
@@ -20,7 +20,7 @@#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)/* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK
include/configs/lager.h +1 -1
@@ -21,7 +21,7 @@#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)/* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK
include/configs/porter.h +1 -1
@@ -25,7 +25,7 @@#define CONFIG_SPI_FLASH_QUAD /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK
include/configs/silk.h +1 -1
@@ -25,7 +25,7 @@#define CONFIG_SPI_FLASH_QUAD /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK
include/configs/stout.h +1 -1
@@ -29,7 +29,7 @@#define CONFIG_SPI_FLASH_QUAD /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0#define CFG_SH_ETHER_PHY_ADDR 0x1#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII#define CFG_SH_ETHER_CACHE_WRITEBACK
scripts/config_whitelist.txt +1 -1
@@ -193,7 +193,7 @@ CFG_SH_ETHER_CACHE_INVALIDATE CFG_SH_ETHER_CACHE_WRITEBACK CFG_SH_ETHER_PHY_ADDR CFG_SH_ETHER_PHY_MODE -CONFIG_SH_ETHER_USE_PORT +CFG_SH_ETHER_USE_PORT CONFIG_SH_QSPI_BASE CONFIG_SLIC CONFIG_SMDK5420
Signature · 1 line
2.25.1
PATCH 185/241 global: Migrate CONFIG_SH_QSPI_BASE to CFG
In reply to Tom Rini--- include/configs/blanche.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/blanche.h +1 -1
@@ -23,7 +23,7 @@/* FLASH */ #if !defined(CONFIG_MTD_NOR_FLASH ) -#define CONFIG_SH_QSPI_BASE 0xE6B10000 +#define CFG_SH_QSPI_BASE 0xE6B10000#else #define CFG_FLASH_SHOW_PROGRESS 45#define CFG_SYS_FLASH_BASE 0x00000000
scripts/config_whitelist.txt +1 -1
@@ -194,7 +194,7 @@ CFG_SH_ETHER_CACHE_WRITEBACK CFG_SH_ETHER_PHY_ADDR CFG_SH_ETHER_PHY_MODE CFG_SH_ETHER_USE_PORT -CONFIG_SH_QSPI_BASE +CFG_SH_QSPI_BASE CONFIG_SLIC CONFIG_SMDK5420 CONFIG_SMP_PEN_ADDR
Signature · 1 line
2.25.1
PATCH 186/241 global: Migrate CONFIG_SLIC to CFG
In reply to Tom Rini--- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- include/configs/p1_p2_rdb_pc.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +1 -1
@@ -187,7 +187,7 @@ void board_gpio_init(void)setbits_be32 (&pgpio->gpdat,0x00080000 );#endif -#ifdef CONFIG_SLIC +#ifdef CFG_SLIC /* reset SLIC */ setbits_be32 (&pgpio->gpdir,0x00040000 );setbits_be32 (&pgpio->gpdat,0x00040000 );
include/configs/p1_p2_rdb_pc.h +2 -2
@@ -13,7 +13,7 @@#include <linux/stringify.h> #if defined(CONFIG_TARGET_P1020RDB_PC ) -#define CONFIG_SLIC +#define CFG_SLIC #define __SW_BOOT_MASK 0x03#define __SW_BOOT_NOR 0x5c#define __SW_BOOT_SPI 0x1c
@@ -42,7 +42,7 @@* 011101 800 800 400 667 PCIe-2 Core0 boot; Core1 hold-off */ #if defined(CONFIG_TARGET_P1020RDB_PD ) -#define CONFIG_SLIC +#define CFG_SLIC #define __SW_BOOT_MASK 0x03#define __SW_BOOT_NOR 0x64#define __SW_BOOT_SPI 0x34
scripts/config_whitelist.txt +1 -1
@@ -195,7 +195,7 @@ CFG_SH_ETHER_PHY_ADDR CFG_SH_ETHER_PHY_MODE CFG_SH_ETHER_USE_PORT CFG_SH_QSPI_BASE -CONFIG_SLIC +CFG_SLIC CONFIG_SMDK5420 CONFIG_SMP_PEN_ADDR CONFIG_SOCRATES
Signature · 1 line
2.25.1
PATCH 187/241 global: Migrate CONFIG_SMDK5420 to CFG
In reply to Tom Rini--- include/configs/smdk5420.h | 8 ++++---- scripts/config_whitelist.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
include/configs/smdk5420.h +4 -4
@@ -5,18 +5,18 @@* Configuration settings for the SAMSUNG SMDK5420 board. */ -#ifndef __CONFIG_SMDK5420_H -#define __CONFIG_SMDK5420_H +#ifndef __CFG_SMDK5420_H +#define __CFG_SMDK5420_H#include <configs/exynos5420-common.h> #include <configs/exynos5-dt-common.h> #include <configs/exynos5-common.h> -#define CONFIG_SMDK5420 /* which is in a SMDK5420 */ +#define CFG_SMDK5420 /* which is in a SMDK5420 */ #define CFG_SYS_SDRAM_BASE 0x20000000/* DRAM Memory Banks */ #define SDRAM_BANK_SIZE (512UL << 20UL)/* 512 MB */ -#endif /* __CONFIG_SMDK5420_H */ +#endif /* __CFG_SMDK5420_H */
scripts/config_whitelist.txt +1 -1
@@ -196,7 +196,7 @@ CFG_SH_ETHER_PHY_MODE CFG_SH_ETHER_USE_PORT CFG_SH_QSPI_BASE CFG_SLIC -CONFIG_SMDK5420 +CFG_SMDK5420 CONFIG_SMP_PEN_ADDR CONFIG_SOCRATES CONFIG_SPI_ADDR
Signature · 1 line
2.25.1
PATCH 188/241 global: Migrate CONFIG_SMP_PEN_ADDR to CFG
In reply to Tom Rini--- arch/arm/cpu/armv7/nonsec_virt.S | 4 ++-- board/samsung/arndale/arndale.c | 4 ++-- include/configs/arndale.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/ls1021aiot.h | 2 +- include/configs/ls1021aqds.h | 2 +- include/configs/ls1021atwr.h | 2 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/cpu/armv7/nonsec_virt.S +2 -2
@@ -205,11 +205,11 @@ ENTRY(_nonsec_init) bx lr ENDPROC(_nonsec_init) -#ifdef CONFIG_SMP_PEN_ADDR +#ifdef CFG_SMP_PEN_ADDR /* void __weak smp_waitloop(unsigned previous_address); */ ENTRY(smp_waitloop) wfi - ldr r1, =CONFIG_SMP_PEN_ADDR @ load start address + ldr r1, =CFG_SMP_PEN_ADDR @ load start address ldr r1, [r1] #ifdef CFG_PEN_ADDR_BIG_ENDIAN rev r1, r1
board/samsung/arndale/arndale.c +2 -2
@@ -112,10 +112,10 @@ int checkboard(void) }#endif -#ifdef CONFIG_SMP_PEN_ADDR +#ifdef CFG_SMP_PEN_ADDR void smp_set_core_boot_addr (unsigned long addr,int corenr) { -writel (addr,CONFIG_SMP_PEN_ADDR ); +writel (addr,CFG_SMP_PEN_ADDR );/* make sure this write is really executed */ __asm__volatile ("dsb\n" );
include/configs/arndale.h +1 -1
@@ -16,7 +16,7 @@/* Miscellaneous configurable options */ -#define CONFIG_SMP_PEN_ADDR 0x02020000 +#define CFG_SMP_PEN_ADDR 0x02020000/* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */ #define CFG_ARM_GIC_BASE_ADDRESS 0x10480000
include/configs/km/pg-wcom-ls102xa.h +1 -1
@@ -164,7 +164,7 @@ {1, {I2C_NULL_HOP} }, \ } -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200#define HWCONFIG_BUFFER_SIZE 256
include/configs/ls1021aiot.h +1 -1
@@ -90,7 +90,7 @@#define FSL_PCIE_COMPAT "fsl,ls1021a-pcie"#define CFG_PEN_ADDR_BIG_ENDIAN -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200#define HWCONFIG_BUFFER_SIZE 256
include/configs/ls1021aqds.h +1 -1
@@ -274,7 +274,7 @@#endif #define CFG_PEN_ADDR_BIG_ENDIAN -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200#define HWCONFIG_BUFFER_SIZE 256
include/configs/ls1021atwr.h +1 -1
@@ -155,7 +155,7 @@/* GPIO */ #define CFG_PEN_ADDR_BIG_ENDIAN -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200#define HWCONFIG_BUFFER_SIZE 256
scripts/config_whitelist.txt +1 -1
@@ -197,7 +197,7 @@ CFG_SH_ETHER_USE_PORT CFG_SH_QSPI_BASE CFG_SLIC CFG_SMDK5420 -CONFIG_SMP_PEN_ADDR +CFG_SMP_PEN_ADDR CONFIG_SOCRATES CONFIG_SPI_ADDR CONFIG_SPI_BOOTING
Signature · 1 line
2.25.1
PATCH 189/241 global: Migrate CONFIG_SOCRATES to CFG
In reply to Tom Rini--- include/configs/socrates.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/socrates.h +1 -1
@@ -17,7 +17,7 @@#define __CONFIG_H/* High Level Configuration Options */ -#define CONFIG_SOCRATES 1 +#define CFG_SOCRATES 1/* * Only possible on E500 Version 2 or newer cores.
scripts/config_whitelist.txt +1 -1
@@ -198,7 +198,7 @@ CFG_SH_QSPI_BASE CFG_SLIC CFG_SMDK5420 CFG_SMP_PEN_ADDR -CONFIG_SOCRATES +CFG_SOCRATES CONFIG_SPI_ADDR CONFIG_SPI_BOOTING CONFIG_SPI_FLASH_QUAD
Signature · 1 line
2.25.1
PATCH 190/241 global: Migrate CONFIG_SPI_ADDR to CFG
In reply to Tom Rini--- include/configs/mt7629.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
include/configs/mt7629.h +2 -2
@@ -17,8 +17,8 @@/* Defines for SPL */ -#define CONFIG_SPI_ADDR 0x30000000 -#define CFG_SYS_UBOOT_BASE (CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO) +#define CFG_SPI_ADDR 0x30000000 +#define CFG_SYS_UBOOT_BASE (CFG_SPI_ADDR + CONFIG_SPL_PAD_TO)/* SPL -> Uboot */
scripts/config_whitelist.txt +1 -1
@@ -199,7 +199,7 @@ CFG_SLIC CFG_SMDK5420 CFG_SMP_PEN_ADDR CFG_SOCRATES -CONFIG_SPI_ADDR +CFG_SPI_ADDR CONFIG_SPI_BOOTING CONFIG_SPI_FLASH_QUAD CONFIG_SPI_FLASH_SIZE
Signature · 1 line
2.25.1
PATCH 191/241 global: Migrate CONFIG_SPI_BOOTING to CFG
In reply to Tom Rini--- arch/arm/mach-exynos/spl_boot.c | 6 +++--- include/configs/exynos5-dt-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-exynos/spl_boot.c +3 -3
@@ -94,7 +94,7 @@ static int config_branch_prediction(int set_cr_z) }#endif -#ifdef CONFIG_SPI_BOOTING +#ifdef CFG_SPI_BOOTING static void spi_rx_tx (struct exynos_spi *regs,int todo,void *dinp,void const *doutp,int i) {
@@ -220,7 +220,7 @@ void copy_uboot_to_ram(void)u32 (*copy_bl2)(u32 offset,u32 nblock,u32 dst) =NULL ;u32 offset =0 , size =0 ; -#ifdef CONFIG_SPI_BOOTING +#ifdef CFG_SPI_BOOTING struct spl_machine_param *param =spl_get_machine_params ();#endif #ifdef CONFIG_SUPPORT_EMMC_BOOT
@@ -248,7 +248,7 @@ void copy_uboot_to_ram(void) bootmode =get_boot_mode ();switch (bootmode) { -#ifdef CONFIG_SPI_BOOTING +#ifdef CFG_SPI_BOOTING case BOOT_MODE_SERIAL :/* Customised function to copy u-boot from SF */ exynos_spi_copy (param->uboot_size,CONFIG_TEXT_BASE );
include/configs/exynos5-dt-common.h +1 -1
@@ -17,6 +17,6 @@#define CFG_SYS_SPI_BASE 0x12D30000#define FLASH_SIZE (4 << 20) -#define CONFIG_SPI_BOOTING +#define CFG_SPI_BOOTING #endif
scripts/config_whitelist.txt +1 -1
@@ -200,7 +200,7 @@ CFG_SMDK5420 CFG_SMP_PEN_ADDR CFG_SOCRATES CFG_SPI_ADDR -CONFIG_SPI_BOOTING +CFG_SPI_BOOTING CONFIG_SPI_FLASH_QUAD CONFIG_SPI_FLASH_SIZE CONFIG_SPI_HALF_DUPLEX
Signature · 1 line
2.25.1
PATCH 192/241 global: Migrate CONFIG_SPI_FLASH_QUAD to CFG
In reply to Tom Rini--- include/configs/alt.h | 2 +- include/configs/porter.h | 2 +- include/configs/silk.h | 2 +- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
include/configs/alt.h +1 -1
@@ -21,7 +21,7 @@#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)/* FLASH */ -#define CONFIG_SPI_FLASH_QUAD +#define CFG_SPI_FLASH_QUAD /* SH Ether */ #define CFG_SH_ETHER_USE_PORT 0
include/configs/porter.h +1 -1
@@ -22,7 +22,7 @@#define RCAR_GEN2_UBOOT_SDRAM_SIZE (1024u * 1024 * 1024)/* FLASH */ -#define CONFIG_SPI_FLASH_QUAD +#define CFG_SPI_FLASH_QUAD /* SH Ether */ #define CFG_SH_ETHER_USE_PORT 0
include/configs/silk.h +1 -1
@@ -22,7 +22,7 @@#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)/* FLASH */ -#define CONFIG_SPI_FLASH_QUAD +#define CFG_SPI_FLASH_QUAD /* SH Ether */ #define CFG_SH_ETHER_USE_PORT 0
include/configs/stout.h +1 -1
@@ -26,7 +26,7 @@#define CFG_SCIF_A /* SPI */ -#define CONFIG_SPI_FLASH_QUAD +#define CFG_SPI_FLASH_QUAD /* SH Ether */ #define CFG_SH_ETHER_USE_PORT 0
scripts/config_whitelist.txt +1 -1
@@ -201,7 +201,7 @@ CFG_SMP_PEN_ADDR CFG_SOCRATES CFG_SPI_ADDR CFG_SPI_BOOTING -CONFIG_SPI_FLASH_QUAD +CFG_SPI_FLASH_QUAD CONFIG_SPI_FLASH_SIZE CONFIG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET
Signature · 1 line
2.25.1
PATCH 193/241 global: Migrate CONFIG_SPI_FLASH_SIZE to CFG
In reply to Tom Rini--- include/configs/beaver.h | 2 +- include/configs/cardhu.h | 2 +- include/configs/cei-tk1-som.h | 2 +- include/configs/dalmore.h | 2 +- include/configs/jetson-tk1.h | 2 +- include/configs/nyan-big.h | 2 +- include/configs/p2371-0000.h | 2 +- include/configs/p2371-2180.h | 2 +- include/configs/p2571.h | 2 +- include/configs/p3450-0000.h | 2 +- include/configs/tec-ng.h | 2 +- include/configs/venice2.h | 2 +- scripts/config_whitelist.txt | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-)
include/configs/beaver.h +1 -1
@@ -22,7 +22,7 @@/* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
include/configs/cardhu.h +1 -1
@@ -26,7 +26,7 @@/* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
include/configs/cei-tk1-som.h +1 -1
@@ -23,7 +23,7 @@#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
include/configs/dalmore.h +1 -1
@@ -20,7 +20,7 @@/* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
include/configs/jetson-tk1.h +1 -1
@@ -21,7 +21,7 @@/* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
include/configs/nyan-big.h +1 -1
@@ -19,7 +19,7 @@#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
include/configs/p2371-0000.h +1 -1
@@ -20,7 +20,7 @@/* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
include/configs/p2371-2180.h +1 -1
@@ -20,7 +20,7 @@/* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
include/configs/p2571.h +1 -1
@@ -20,7 +20,7 @@/* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
include/configs/p3450-0000.h +1 -1
@@ -24,7 +24,7 @@func (DHCP , dhcp, na) /* Environment at end of QSPI, in the VER partition */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20)#define BOARD_EXTRA_ENV_SETTINGS \ "preboot=if test -e mmc 1:1 /u-boot-preboot.scr; then " \
include/configs/tec-ng.h +1 -1
@@ -20,7 +20,7 @@/* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
include/configs/venice2.h +1 -1
@@ -21,7 +21,7 @@/* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
scripts/config_whitelist.txt +1 -1
@@ -202,7 +202,7 @@ CFG_SOCRATES CFG_SPI_ADDR CFG_SPI_BOOTING CFG_SPI_FLASH_QUAD -CONFIG_SPI_FLASH_SIZE +CFG_SPI_FLASH_SIZE CONFIG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET CONFIG_STACKBASE
Signature · 1 line
2.25.1
PATCH 194/241 global: Migrate CONFIG_SPI_HALF_DUPLEX to CFG
In reply to Tom Rini--- include/configs/mxs.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/mxs.h +1 -1
@@ -88,7 +88,7 @@/* SPI */ #ifdef CONFIG_CMD_SPI -#define CONFIG_SPI_HALF_DUPLEX +#define CFG_SPI_HALF_DUPLEX #endif #endif /* __CONFIGS_MXS_H__ */
scripts/config_whitelist.txt +1 -1
@@ -203,7 +203,7 @@ CFG_SPI_ADDR CFG_SPI_BOOTING CFG_SPI_FLASH_QUAD CFG_SPI_FLASH_SIZE -CONFIG_SPI_HALF_DUPLEX +CFG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET CONFIG_STACKBASE CONFIG_STANDALONE_LOAD_ADDR
Signature · 1 line
2.25.1
PATCH 195/241 global: Migrate CONFIG_SPI_N25Q256A_RESET to CFG
In reply to Tom Rini--- include/configs/socfpga_sr1500.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/socfpga_sr1500.h +1 -1
@@ -16,7 +16,7 @@#define PHY_ANEG_TIMEOUT 8000/* Enable SPI NOR flash reset, needed for SPI booting */ -#define CONFIG_SPI_N25Q256A_RESET +#define CFG_SPI_N25Q256A_RESET /* Environment setting for SPI flash */
scripts/config_whitelist.txt +1 -1
@@ -204,7 +204,7 @@ CFG_SPI_BOOTING CFG_SPI_FLASH_QUAD CFG_SPI_FLASH_SIZE CFG_SPI_HALF_DUPLEX -CONFIG_SPI_N25Q256A_RESET +CFG_SPI_N25Q256A_RESET CONFIG_STACKBASE CONFIG_STANDALONE_LOAD_ADDR CONFIG_STD_DEVICES_SETTINGS
Signature · 1 line
2.25.1
PATCH 196/241 global: Migrate CONFIG_STACKBASE to CFG
In reply to Tom Rini--- include/configs/tegra-common.h | 2 +- include/configs/tegra114-common.h | 2 +- include/configs/tegra124-common.h | 2 +- include/configs/tegra20-common.h | 2 +- include/configs/tegra30-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
include/configs/tegra-common.h +1 -1
@@ -45,7 +45,7 @@#define CFG_SYS_BOOTMAPSZ (256 << 20)/* 256M */ #ifndef CONFIG_ARM64 -#define CFG_SYS_INIT_RAM_ADDR CONFIG_STACKBASE +#define CFG_SYS_INIT_RAM_ADDR CFG_STACKBASE#define CFG_SYS_INIT_RAM_SIZE CONFIG_SYS_MALLOC_LEN/* Defines for SPL */
include/configs/tegra114-common.h +1 -1
@@ -15,7 +15,7 @@/* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x83800000/* 56MB */ +#define CFG_STACKBASE 0x83800000/* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map
include/configs/tegra124-common.h +1 -1
@@ -17,7 +17,7 @@/* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x83800000/* 56MB */ +#define CFG_STACKBASE 0x83800000/* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map
include/configs/tegra20-common.h +1 -1
@@ -16,7 +16,7 @@/* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x03800000/* 56MB */ +#define CFG_STACKBASE 0x03800000/* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map
include/configs/tegra30-common.h +1 -1
@@ -16,7 +16,7 @@/* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x83800000/* 56MB */ +#define CFG_STACKBASE 0x83800000/* 56MB */ /* * Memory layout for where various images get loaded by boot scripts:
scripts/config_whitelist.txt +1 -1
@@ -205,7 +205,7 @@ CFG_SPI_FLASH_QUAD CFG_SPI_FLASH_SIZE CFG_SPI_HALF_DUPLEX CFG_SPI_N25Q256A_RESET -CONFIG_STACKBASE +CFG_STACKBASE CONFIG_STANDALONE_LOAD_ADDR CONFIG_STD_DEVICES_SETTINGS CONFIG_TEGRA_BOARD_STRING
Signature · 1 line
2.25.1
PATCH 197/241 global: Migrate CONFIG_STANDALONE_LOAD_ADDR to CFG
In reply to Tom Rini--- README | 2 +- arch/arc/config.mk | 2 +- arch/arm/config.mk | 6 +++--- arch/arm/include/asm/arch-fsl-layerscape/config.h | 2 +- arch/m68k/config.mk | 2 +- arch/microblaze/config.mk | 2 +- arch/mips/config.mk | 4 ++-- arch/nios2/config.mk | 2 +- arch/powerpc/config.mk | 2 +- arch/riscv/config.mk | 2 +- arch/sh/config.mk | 2 +- arch/x86/config.mk | 2 +- config.mk | 2 +- examples/standalone/Makefile | 2 +- include/configs/display5.h | 2 +- include/configs/microchip_mpfs_icicle.h | 2 +- include/configs/opos6uldev.h | 2 +- include/configs/qemu-riscv.h | 2 +- include/configs/sifive-unleashed.h | 2 +- include/configs/sifive-unmatched.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/xtfpga.h | 6 +++--- scripts/config_whitelist.txt | 2 +- tools/patman/test_checkpatch.py | 2 +- 24 files changed, 29 insertions(+), 29 deletions(-)
README +1 -1
@@ -1224,7 +1224,7 @@ The following options need to be configured: this is instead controlled by the value of /config/load-environment. - CONFIG_STANDALONE_LOAD_ADDR + CFG_STANDALONE_LOAD_ADDR This option defines a board specific value for the address where standalone program gets loaded, thus
arch/arc/config.mk +1 -1
@@ -23,4 +23,4 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -fno-common LDFLAGS_FINAL += -pie --gc-sections # Load address for standalone apps -CONFIG_STANDALONE_LOAD_ADDR ?= 0x82000000 +CFG_STANDALONE_LOAD_ADDR ?= 0x82000000
arch/arm/config.mk +3 -3
@@ -3,11 +3,11 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, [email protected]. -ifndef CONFIG_STANDALONE_LOAD_ADDR +ifndef CFG_STANDALONE_LOAD_ADDR ifneq ($(CONFIG_ARCH_OMAP2PLUS),) -CONFIG_STANDALONE_LOAD_ADDR = 0x80300000 +CFG_STANDALONE_LOAD_ADDR = 0x80300000 else -CONFIG_STANDALONE_LOAD_ADDR = 0xc100000 +CFG_STANDALONE_LOAD_ADDR = 0xc100000 endif endif
arch/arm/include/asm/arch-fsl-layerscape/config.h +1 -1
@@ -14,7 +14,7 @@#include <linux/bitops.h> #endif -#define CONFIG_STANDALONE_LOAD_ADDR 0x80300000 +#define CFG_STANDALONE_LOAD_ADDR 0x80300000/* * Reserve secure memory
arch/m68k/config.mk +1 -1
@@ -3,7 +3,7 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, [email protected]. -CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000 +CFG_STANDALONE_LOAD_ADDR ?= 0x20000 PLATFORM_CPPFLAGS += -D__M68K__ KBUILD_LDFLAGS += -n
arch/microblaze/config.mk +1 -1
@@ -6,7 +6,7 @@ # (C) Copyright 2004 Atmark Techno, Inc. # Yasushi SHOJI <[email protected]> -CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000 +CFG_STANDALONE_LOAD_ADDR ?= 0x80F00000 PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__ PLATFORM_CPPFLAGS += -fdata-sections -ffunction-sections
arch/mips/config.mk +2 -2
@@ -25,14 +25,14 @@ ifdef CONFIG_32BIT PLATFORM_CPPFLAGS += -mabi=32 KBUILD_LDFLAGS += -m $(32bit-emul) OBJCOPYFLAGS += -O $(32bit-bfd) -CONFIG_STANDALONE_LOAD_ADDR ?= 0x80200000 +CFG_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 +CFG_STANDALONE_LOAD_ADDR ?= 0xffffffff80200000 endif PLATFORM_CPPFLAGS += -D__MIPS__
arch/nios2/config.mk +1 -1
@@ -4,7 +4,7 @@ # Psyent Corporation <www.psyent.com> # Scott McNutt <[email protected]> -CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000 +CFG_STANDALONE_LOAD_ADDR ?= 0x02000000 PLATFORM_CPPFLAGS += -D__NIOS2__ PLATFORM_CPPFLAGS += -G0
arch/powerpc/config.mk +1 -1
@@ -3,7 +3,7 @@ # (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, [email protected]. -CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000 +CFG_STANDALONE_LOAD_ADDR ?= 0x40000 LDFLAGS_FINAL += --gc-sections LDFLAGS_FINAL += --bss-plt PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections \
arch/riscv/config.mk +1 -1
@@ -23,7 +23,7 @@ KBUILD_LDFLAGS += -m $(64bit-emul) EFI_LDS := elf_riscv64_efi.lds endif -CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 +CFG_STANDALONE_LOAD_ADDR ?= 0x00000000 PLATFORM_CPPFLAGS += -ffixed-gp -fpic PLATFORM_RELFLAGS += -fno-common -gdwarf-2 -ffunction-sections \
arch/sh/config.mk +1 -1
@@ -3,7 +3,7 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, [email protected]. -CONFIG_STANDALONE_LOAD_ADDR ?= 0x8C000000 +CFG_STANDALONE_LOAD_ADDR ?= 0x8C000000 ifeq ($(CPU),sh2) LDFLAGS_STANDALONE += -EB endif
arch/x86/config.mk +1 -1
@@ -3,7 +3,7 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, [email protected]. -CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000 +CFG_STANDALONE_LOAD_ADDR ?= 0x40000 PLATFORM_CPPFLAGS += -fomit-frame-pointer PF_CPPFLAGS_X86 := $(call cc-option, -fno-toplevel-reorder, \
config.mk +1 -1
@@ -76,4 +76,4 @@ export PLATFORM_CPPFLAGS export RELFLAGS export LDFLAGS_FINAL export LDFLAGS_STANDALONE -export CONFIG_STANDALONE_LOAD_ADDR +export CFG_STANDALONE_LOAD_ADDR
examples/standalone/Makefile +1 -1
@@ -42,7 +42,7 @@ endif # source file. ccflags-y += $(call cc-option,-fno-toplevel-reorder) -LDFLAGS_STANDALONE += -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) +LDFLAGS_STANDALONE += -Ttext $(CFG_STANDALONE_LOAD_ADDR) #########################################################################
include/configs/display5.h +1 -1
@@ -279,7 +279,7 @@/* Miscellaneous configurable options */ -#define CONFIG_STANDALONE_LOAD_ADDR 0x10001000 +#define CFG_STANDALONE_LOAD_ADDR 0x10001000/* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
include/configs/microchip_mpfs_icicle.h +1 -1
@@ -11,7 +11,7 @@#define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 +#define CFG_STANDALONE_LOAD_ADDR 0x80200000/* Environment options */
include/configs/opos6uldev.h +1 -1
@@ -11,7 +11,7 @@#include "mx6_common.h" /* Miscellaneous configurable options */ -#define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR +#define CFG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR/* Physical Memory Map */ #define CFG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR
include/configs/qemu-riscv.h +1 -1
@@ -10,7 +10,7 @@#define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 +#define CFG_STANDALONE_LOAD_ADDR 0x80200000#define RISCV_MMODE_TIMERBASE 0x2000000#define RISCV_MMODE_TIMER_FREQ 1000000
include/configs/sifive-unleashed.h +1 -1
@@ -13,7 +13,7 @@#define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 +#define CFG_STANDALONE_LOAD_ADDR 0x80200000#define RISCV_MMODE_TIMERBASE 0x2000000#define RISCV_MMODE_TIMER_FREQ 1000000
include/configs/sifive-unmatched.h +1 -1
@@ -13,7 +13,7 @@#define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 +#define CFG_STANDALONE_LOAD_ADDR 0x80200000/* Environment options */
include/configs/sunxi-common.h +1 -1
@@ -77,7 +77,7 @@*/ /* standalone support */ -#define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR +#define CFG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR/* FLASH and environment organization */
include/configs/xtfpga.h +3 -3
@@ -61,12 +61,12 @@*/ #if XCHAL_HAVE_PTP_MMU #if XCHAL_VECBASE_RESET_VADDR ==XCHAL_VECBASE_RESET_PADDR -#define CONFIG_STANDALONE_LOAD_ADDR 0x00800000 +#define CFG_STANDALONE_LOAD_ADDR 0x00800000#else -#define CONFIG_STANDALONE_LOAD_ADDR 0xd0800000 +#define CFG_STANDALONE_LOAD_ADDR 0xd0800000#endif #else -#define CONFIG_STANDALONE_LOAD_ADDR 0x60800000 +#define CFG_STANDALONE_LOAD_ADDR 0x60800000#endif #if defined(CFG_MAX_MEM_MAPPED) && \
scripts/config_whitelist.txt +1 -1
@@ -206,7 +206,7 @@ CFG_SPI_FLASH_SIZE CFG_SPI_HALF_DUPLEX CFG_SPI_N25Q256A_RESET CFG_STACKBASE -CONFIG_STANDALONE_LOAD_ADDR +CFG_STANDALONE_LOAD_ADDR CONFIG_STD_DEVICES_SETTINGS CONFIG_TEGRA_BOARD_STRING CONFIG_TEGRA_ENABLE_UARTA
tools/patman/test_checkpatch.py +1 -1
@@ -205,7 +205,7 @@ index 6f3748d..f9e4e65 100644 + You can add calls to bootstage_mark() to set time markers. + - Standalone program support: - CONFIG_STANDALONE_LOAD_ADDR + CFG_STANDALONE_LOAD_ADDR diff --git a/MAINTAINERS b/MAINTAINERS index b167b028ec..beb7dc634f 100644
Signature · 1 line
2.25.1
PATCH 198/241 global: Migrate CONFIG_STD_DEVICES_SETTINGS to CFG
In reply to Tom Rini--- include/configs/bayleybay.h | 2 +- include/configs/cherryhill.h | 2 +- include/configs/chromebook_coral.h | 4 ++-- include/configs/chromebook_samus.h | 4 ++-- include/configs/conga-qeval20-qa3-e3845.h | 2 +- include/configs/coreboot.h | 2 +- include/configs/cougarcanyon2.h | 2 +- include/configs/crownbay.h | 2 +- include/configs/dfi-bt700.h | 2 +- include/configs/efi-x86_app.h | 2 +- include/configs/efi-x86_payload.h | 2 +- include/configs/galileo.h | 2 +- include/configs/minnowmax.h | 2 +- include/configs/qemu-x86.h | 2 +- include/configs/slimbootloader.h | 4 ++-- include/configs/som-db5800-som-6867.h | 2 +- include/configs/theadorable-x86-common.h | 2 +- include/configs/x86-chromebook.h | 2 +- include/configs/x86-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-)
include/configs/bayleybay.h +1 -1
@@ -12,7 +12,7 @@#include <configs/x86-common.h> -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0"
include/configs/cherryhill.h +1 -1
@@ -8,7 +8,7 @@#include <configs/x86-common.h> -#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0"
include/configs/chromebook_coral.h +2 -2
@@ -13,8 +13,8 @@#include <configs/x86-common.h> #include <configs/x86-chromebook.h> -#undef CONFIG_STD_DEVICES_SETTINGS -#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ +#undef CFG_STD_DEVICES_SETTINGS +#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0"
include/configs/chromebook_samus.h +2 -2
@@ -15,8 +15,8 @@#include <configs/x86-common.h> #include <configs/x86-chromebook.h> -#undef CONFIG_STD_DEVICES_SETTINGS -#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ +#undef CFG_STD_DEVICES_SETTINGS +#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0"
include/configs/conga-qeval20-qa3-e3845.h +1 -1
@@ -12,7 +12,7 @@#include <configs/x86-common.h> -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0"
include/configs/coreboot.h +1 -1
@@ -15,7 +15,7 @@#include <configs/x86-common.h> -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0"
include/configs/cougarcanyon2.h +1 -1
@@ -8,7 +8,7 @@#include <configs/x86-common.h> -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ "stdout=serial,vga\0" \ "stderr=serial,vga\0"
include/configs/crownbay.h +1 -1
@@ -12,7 +12,7 @@#include <configs/x86-common.h> -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0"
include/configs/dfi-bt700.h +1 -1
@@ -16,7 +16,7 @@/* Use BayTrail internal HS UART which is memory-mapped */ #endif -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0"
include/configs/efi-x86_app.h +1 -1
@@ -10,7 +10,7 @@#undef CONFIG_TPM_TIS_BASE_ADDRESS -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=vidconsole\0" \ "stderr=vidconsole\0"
include/configs/efi-x86_payload.h +1 -1
@@ -12,7 +12,7 @@#include <configs/x86-common.h> -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0"
include/configs/galileo.h +1 -1
@@ -14,7 +14,7 @@/* ns16550 UART is memory-mapped in Quark SoC */ -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0"
include/configs/minnowmax.h +1 -1
@@ -12,7 +12,7 @@#include <configs/x86-common.h> -#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0" \ "usb_pgood_delay=40\0"
include/configs/qemu-x86.h +1 -1
@@ -22,7 +22,7 @@#include <config_distro_bootcmd.h> #include <configs/x86-common.h> -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0"
include/configs/slimbootloader.h +2 -2
@@ -8,7 +8,7 @@#include <configs/x86-common.h> -#define CONFIG_STD_DEVICES_SETTINGS \ +#define CFG_STD_DEVICES_SETTINGS \ "stdin=serial,i8042-kbd,usbkbd\0" \ "stdout=serial\0" \ "stderr=serial\0"
@@ -18,7 +18,7 @@*/ #undef CFG_EXTRA_ENV_SETTINGS#define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_STD_DEVICES_SETTINGS \ + CFG_STD_DEVICES_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=0x4000000\0" \
include/configs/som-db5800-som-6867.h +1 -1
@@ -12,7 +12,7 @@#include <configs/x86-common.h> -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0"
include/configs/theadorable-x86-common.h +1 -1
@@ -11,7 +11,7 @@#ifndef __THEADORABLE_X86_COMMON_H#define __THEADORABLE_X86_COMMON_H -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0"
include/configs/x86-chromebook.h +1 -1
@@ -13,7 +13,7 @@#define VIDEO_IO_OFFSET 0#define CONFIG_X86EMU_RAW_IO -#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0"
include/configs/x86-common.h +1 -1
@@ -62,7 +62,7 @@#define CFG_EXTRA_ENV_SETTINGS \ DISTRO_BOOTENV \ - CONFIG_STD_DEVICES_SETTINGS \ + CFG_STD_DEVICES_SETTINGS \ SPLASH_SETTINGS \ "pciconfighost=1\0" \ "netdev=eth0\0" \
scripts/config_whitelist.txt +1 -1
@@ -207,7 +207,7 @@ CFG_SPI_HALF_DUPLEX CFG_SPI_N25Q256A_RESET CFG_STACKBASE CFG_STANDALONE_LOAD_ADDR -CONFIG_STD_DEVICES_SETTINGS +CFG_STD_DEVICES_SETTINGS CONFIG_TEGRA_BOARD_STRING CONFIG_TEGRA_ENABLE_UARTA CONFIG_TEGRA_ENABLE_UARTD
Signature · 1 line
2.25.1
PATCH 199/241 global: Migrate CONFIG_TEGRA_BOARD_STRING to CFG
In reply to Tom Rini--- arch/arm/mach-tegra/board2.c | 2 +- include/configs/beaver.h | 2 +- include/configs/cardhu.h | 2 +- include/configs/cei-tk1-som.h | 2 +- include/configs/dalmore.h | 2 +- include/configs/harmony.h | 2 +- include/configs/jetson-tk1.h | 2 +- include/configs/medcom-wide.h | 2 +- include/configs/nyan-big.h | 2 +- include/configs/p2371-0000.h | 2 +- include/configs/p2371-2180.h | 2 +- include/configs/p2571.h | 2 +- include/configs/p2771-0000.h | 2 +- include/configs/p3450-0000.h | 2 +- include/configs/paz00.h | 2 +- include/configs/plutux.h | 2 +- include/configs/seaboard.h | 2 +- include/configs/tec-ng.h | 2 +- include/configs/tec.h | 2 +- include/configs/trimslice.h | 2 +- include/configs/venice2.h | 2 +- include/configs/ventana.h | 2 +- scripts/config_whitelist.txt | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-)
arch/arm/mach-tegra/board2.c +1 -1
@@ -89,7 +89,7 @@ int checkboard(void) {int board_id =tegra_board_id (); -printf ("Board: %s" ,CONFIG_TEGRA_BOARD_STRING ); +printf ("Board: %s" ,CFG_TEGRA_BOARD_STRING );if (board_id !=-1 )printf (", ID: %d\n" , board_id);printf ("\n" );
include/configs/beaver.h +1 -1
@@ -14,7 +14,7 @@#define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Beaver" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Beaver"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA
include/configs/cardhu.h +1 -1
@@ -14,7 +14,7 @@#define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Cardhu" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Cardhu"#define BOARD_EXTRA_ENV_SETTINGS \ "board_name=cardhu-a04\0" \
include/configs/cei-tk1-som.h +1 -1
@@ -16,7 +16,7 @@#include "tegra124-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "CEI tk1-som" +#define CFG_TEGRA_BOARD_STRING "CEI tk1-som"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD
include/configs/dalmore.h +1 -1
@@ -11,7 +11,7 @@#include "tegra114-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Dalmore" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Dalmore"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD
include/configs/harmony.h +1 -1
@@ -11,7 +11,7 @@#include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Harmony" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Harmony"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD
include/configs/jetson-tk1.h +1 -1
@@ -12,7 +12,7 @@#include "tegra124-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD
include/configs/medcom-wide.h +1 -1
@@ -12,7 +12,7 @@#include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide" +#define CFG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
include/configs/nyan-big.h +1 -1
@@ -12,7 +12,7 @@#include "tegra124-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big" +#define CFG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA
include/configs/p2371-0000.h +1 -1
@@ -12,7 +12,7 @@#include "tegra210-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2371-0000" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-0000"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA
include/configs/p2371-2180.h +1 -1
@@ -12,7 +12,7 @@#include "tegra210-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2371-2180" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-2180"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA
include/configs/p2571.h +1 -1
@@ -12,7 +12,7 @@#include "tegra210-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2571" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P2571"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA
include/configs/p2771-0000.h +1 -1
@@ -11,7 +11,7 @@#include "tegra186-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2771-0000" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P2771-0000"/* Environment in eMMC, at the end of 2nd "boot sector" */
include/configs/p3450-0000.h +1 -1
@@ -11,7 +11,7 @@#include "tegra210-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P3450-0000" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P3450-0000"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA
include/configs/paz00.h +1 -1
@@ -13,7 +13,7 @@#include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Compal Paz00" +#define CFG_TEGRA_BOARD_STRING "Compal Paz00"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA
include/configs/plutux.h +1 -1
@@ -12,7 +12,7 @@#include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Plutux" +#define CFG_TEGRA_BOARD_STRING "Avionic Design Plutux"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
include/configs/seaboard.h +1 -1
@@ -12,7 +12,7 @@#include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Seaboard" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Seaboard"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD
include/configs/tec-ng.h +1 -1
@@ -10,7 +10,7 @@#include "tegra30-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier" +#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD
include/configs/tec.h +1 -1
@@ -12,7 +12,7 @@#include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier" +#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
include/configs/trimslice.h +1 -1
@@ -11,7 +11,7 @@#include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Compulab Trimslice" +#define CFG_TEGRA_BOARD_STRING "Compulab Trimslice"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA
include/configs/venice2.h +1 -1
@@ -12,7 +12,7 @@#include "tegra124-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Venice2" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Venice2"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA
include/configs/ventana.h +1 -1
@@ -11,7 +11,7 @@#include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Ventana" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Ventana"/* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD
scripts/config_whitelist.txt +1 -1
@@ -208,7 +208,7 @@ CFG_SPI_N25Q256A_RESET CFG_STACKBASE CFG_STANDALONE_LOAD_ADDR CFG_STD_DEVICES_SETTINGS -CONFIG_TEGRA_BOARD_STRING +CFG_TEGRA_BOARD_STRING CONFIG_TEGRA_ENABLE_UARTA CONFIG_TEGRA_ENABLE_UARTD CONFIG_TEGRA_SLINK_CTRLS
Signature · 1 line
2.25.1
PATCH 200/241 global: Migrate CONFIG_TEGRA_ENABLE_UARTA to CFG
--- arch/arm/mach-tegra/board.c | 2 +- include/configs/apalis-tk1.h | 2 +- include/configs/apalis_t30.h | 2 +- include/configs/beaver.h | 2 +- include/configs/cardhu.h | 2 +- include/configs/colibri_t20.h | 2 +- include/configs/colibri_t30.h | 2 +- include/configs/harmony.h | 2 +- include/configs/nyan-big.h | 2 +- include/configs/p2371-0000.h | 2 +- include/configs/p2371-2180.h | 2 +- include/configs/p2571.h | 2 +- include/configs/p3450-0000.h | 2 +- include/configs/paz00.h | 2 +- include/configs/trimslice.h | 2 +- include/configs/venice2.h | 2 +- scripts/config_whitelist.txt | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-)
arch/arm/mach-tegra/board.c +1 -1
@@ -238,7 +238,7 @@ void board_init_uart_f(void)#if IS_ENABLED (CONFIG_TEGRA_PINCTRL )int uart_ids =0 ;/* bit mask of which UART ids to enable */ -#ifdef CONFIG_TEGRA_ENABLE_UARTA +#ifdef CFG_TEGRA_ENABLE_UARTA uart_ids |=UARTA ;#endif #ifdef CONFIG_TEGRA_ENABLE_UARTB
include/configs/apalis-tk1.h +1 -1
@@ -13,7 +13,7 @@#include "tegra124-common.h" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE#define FDT_MODULE "apalis-v1.2"
include/configs/apalis_t30.h +1 -1
@@ -20,7 +20,7 @@* Apalis UART3: NVIDIA UARTB * Apalis UART4: NVIDIA UARTC */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE#define UBOOT_UPDATE \
include/configs/beaver.h +1 -1
@@ -17,7 +17,7 @@#define CFG_TEGRA_BOARD_STRING "NVIDIA Beaver"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* SPI */
include/configs/cardhu.h +1 -1
@@ -21,7 +21,7 @@"fdtfile=tegra30-cardhu-a04.dtb\0" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* SPI */
include/configs/colibri_t20.h +1 -1
@@ -11,7 +11,7 @@#include "tegra20-common.h" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_UARTA_SDIO1 #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
include/configs/colibri_t30.h +1 -1
@@ -21,7 +21,7 @@* Colibri UART-B: NVIDIA UARTD * Colibri UART-C: NVIDIA UARTB */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE#define UBOOT_UPDATE \
include/configs/harmony.h +1 -1
@@ -18,7 +18,7 @@/* UARTD: keyboard satellite board UART, default */ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -#ifdef CONFIG_TEGRA_ENABLE_UARTA +#ifdef CFG_TEGRA_ENABLE_UARTA /* UARTA: debug board UART */ #define CFG_SYS_NS16550_COM2 NV_PA_APB_UARTA_BASE#endif
include/configs/nyan-big.h +1 -1
@@ -15,7 +15,7 @@#define CFG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* SPI */
include/configs/p2371-0000.h +1 -1
@@ -15,7 +15,7 @@#define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-0000"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */
include/configs/p2371-2180.h +1 -1
@@ -15,7 +15,7 @@#define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-2180"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */
include/configs/p2571.h +1 -1
@@ -15,7 +15,7 @@#define CFG_TEGRA_BOARD_STRING "NVIDIA P2571"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */
include/configs/p3450-0000.h +1 -1
@@ -14,7 +14,7 @@#define CFG_TEGRA_BOARD_STRING "NVIDIA P3450-0000"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_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 +1 -1
@@ -16,7 +16,7 @@#define CFG_TEGRA_BOARD_STRING "Compal Paz00"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_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/trimslice.h +1 -1
@@ -14,7 +14,7 @@#define CFG_TEGRA_BOARD_STRING "Compulab Trimslice"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_UARTA_GPU #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
include/configs/venice2.h +1 -1
@@ -15,7 +15,7 @@#define CFG_TEGRA_BOARD_STRING "NVIDIA Venice2"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* Environment in eMMC, at the end of 2nd "boot sector" */
scripts/config_whitelist.txt +1 -1
@@ -209,7 +209,7 @@ CFG_STACKBASE CFG_STANDALONE_LOAD_ADDR CFG_STD_DEVICES_SETTINGS CFG_TEGRA_BOARD_STRING -CONFIG_TEGRA_ENABLE_UARTA +CFG_TEGRA_ENABLE_UARTA CONFIG_TEGRA_ENABLE_UARTD CONFIG_TEGRA_SLINK_CTRLS CONFIG_TEGRA_SPI
Signature · 1 line
2.25.1
PATCH 201/241 global: Migrate CONFIG_TEGRA_ENABLE_UARTD to CFG
--- arch/arm/mach-tegra/board.c | 2 +- include/configs/cei-tk1-som.h | 2 +- include/configs/dalmore.h | 2 +- include/configs/harmony.h | 2 +- include/configs/jetson-tk1.h | 2 +- include/configs/medcom-wide.h | 2 +- include/configs/plutux.h | 2 +- include/configs/seaboard.h | 2 +- include/configs/tec-ng.h | 2 +- include/configs/tec.h | 2 +- include/configs/ventana.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)
arch/arm/mach-tegra/board.c +1 -1
@@ -247,7 +247,7 @@ void board_init_uart_f(void)#ifdef CONFIG_TEGRA_ENABLE_UARTC uart_ids |=UARTC ;#endif -#ifdef CONFIG_TEGRA_ENABLE_UARTD +#ifdef CFG_TEGRA_ENABLE_UARTD uart_ids |=UARTD ;#endif #ifdef CONFIG_TEGRA_ENABLE_UARTE
include/configs/cei-tk1-som.h +1 -1
@@ -19,7 +19,7 @@#define CFG_TEGRA_BOARD_STRING "CEI tk1-som"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD +#define CFG_TEGRA_ENABLE_UARTD #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* SPI */
include/configs/dalmore.h +1 -1
@@ -14,7 +14,7 @@#define CFG_TEGRA_BOARD_STRING "NVIDIA Dalmore"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD +#define CFG_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 +1 -1
@@ -14,7 +14,7 @@#define CFG_TEGRA_BOARD_STRING "NVIDIA Harmony"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD +#define CFG_TEGRA_ENABLE_UARTD /* UARTD: keyboard satellite board UART, default */ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
include/configs/jetson-tk1.h +1 -1
@@ -15,7 +15,7 @@#define CFG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD +#define CFG_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/medcom-wide.h +1 -1
@@ -15,7 +15,7 @@#define CFG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ +#define CFG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* NAND support */
include/configs/plutux.h +1 -1
@@ -15,7 +15,7 @@#define CFG_TEGRA_BOARD_STRING "Avionic Design Plutux"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ +#define CFG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* NAND support */
include/configs/seaboard.h +1 -1
@@ -15,7 +15,7 @@#define CFG_TEGRA_BOARD_STRING "NVIDIA Seaboard"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD +#define CFG_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 +1 -1
@@ -13,7 +13,7 @@#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD +#define CFG_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.h +1 -1
@@ -15,7 +15,7 @@#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ +#define CFG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* NAND support */
include/configs/ventana.h +1 -1
@@ -14,7 +14,7 @@#define CFG_TEGRA_BOARD_STRING "NVIDIA Ventana"/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD +#define CFG_TEGRA_ENABLE_UARTD #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* Environment in eMMC, at the end of 2nd "boot sector" */
scripts/config_whitelist.txt +1 -1
@@ -210,7 +210,7 @@ CFG_STANDALONE_LOAD_ADDR CFG_STD_DEVICES_SETTINGS CFG_TEGRA_BOARD_STRING CFG_TEGRA_ENABLE_UARTA -CONFIG_TEGRA_ENABLE_UARTD +CFG_TEGRA_ENABLE_UARTD CONFIG_TEGRA_SLINK_CTRLS CONFIG_TEGRA_SPI CONFIG_TEGRA_UARTA_GPU
Signature · 1 line
2.25.1
PATCH 202/241 global: Migrate CONFIG_TEGRA_SLINK_CTRLS to CFG
In reply to Tom Rini--- include/configs/beaver.h | 2 +- include/configs/cardhu.h | 2 +- include/configs/tec-ng.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
include/configs/beaver.h +1 -1
@@ -21,7 +21,7 @@#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* SPI */ -#define CONFIG_TEGRA_SLINK_CTRLS 6 +#define CFG_TEGRA_SLINK_CTRLS 6#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
include/configs/cardhu.h +1 -1
@@ -25,7 +25,7 @@#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* SPI */ -#define CONFIG_TEGRA_SLINK_CTRLS 6 +#define CFG_TEGRA_SLINK_CTRLS 6#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
include/configs/tec-ng.h +1 -1
@@ -19,7 +19,7 @@/* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_TEGRA_SLINK_CTRLS 6 +#define CFG_TEGRA_SLINK_CTRLS 6#define CFG_SPI_FLASH_SIZE (4 << 20)#include "tegra-common-post.h"
scripts/config_whitelist.txt +1 -1
@@ -211,7 +211,7 @@ CFG_STD_DEVICES_SETTINGS CFG_TEGRA_BOARD_STRING CFG_TEGRA_ENABLE_UARTA CFG_TEGRA_ENABLE_UARTD -CONFIG_TEGRA_SLINK_CTRLS +CFG_TEGRA_SLINK_CTRLS CONFIG_TEGRA_SPI CONFIG_TEGRA_UARTA_GPU CONFIG_TEGRA_UARTA_SDIO1
Signature · 1 line
2.25.1
PATCH 203/241 global: Migrate CONFIG_TEGRA_SPI to CFG
In reply to Tom Rini--- arch/arm/mach-tegra/board2.c | 2 +- include/configs/tegra-common-post.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-tegra/board2.c +1 -1
@@ -125,7 +125,7 @@ int board_init(void)tegra_gpu_config (); -#ifdef CONFIG_TEGRA_SPI +#ifdef CFG_TEGRA_SPI pin_mux_spi ();#endif
include/configs/tegra-common-post.h +1 -1
@@ -74,7 +74,7 @@ BOARD_EXTRA_ENV_SETTINGS#if defined(CONFIG_TEGRA20_SFLASH ) || defined(CONFIG_TEGRA20_SLINK ) || defined(CONFIG_TEGRA114_SPI ) -#define CONFIG_TEGRA_SPI +#define CFG_TEGRA_SPI #endif #endif /* __TEGRA_COMMON_POST_H */
scripts/config_whitelist.txt +1 -1
@@ -212,7 +212,7 @@ CFG_TEGRA_BOARD_STRING CFG_TEGRA_ENABLE_UARTA CFG_TEGRA_ENABLE_UARTD CFG_TEGRA_SLINK_CTRLS -CONFIG_TEGRA_SPI +CFG_TEGRA_SPI CONFIG_TEGRA_UARTA_GPU CONFIG_TEGRA_UARTA_SDIO1 CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
Signature · 1 line
2.25.1
PATCH 204/241 global: Migrate CONFIG_TEGRA_UARTA_GPU to CFG
In reply to Tom Rini--- arch/arm/mach-tegra/board.c | 2 +- include/configs/trimslice.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-tegra/board.c +1 -1
@@ -168,7 +168,7 @@ static int uart_configs[] = {#if defined(CONFIG_TEGRA20 )#if defined(CONFIG_TEGRA_UARTA_UAA_UAB ) FUNCMUX_UART1_UAA_UAB, -#elif defined(CONFIG_TEGRA_UARTA_GPU ) +#elif defined(CFG_TEGRA_UARTA_GPU ) FUNCMUX_UART1_GPU,#elif defined(CONFIG_TEGRA_UARTA_SDIO1 ) FUNCMUX_UART1_SDIO1,
include/configs/trimslice.h +1 -1
@@ -15,7 +15,7 @@/* Board-specific serial config */ #define CFG_TEGRA_ENABLE_UARTA -#define CONFIG_TEGRA_UARTA_GPU +#define CFG_TEGRA_UARTA_GPU #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* SPI */
scripts/config_whitelist.txt +1 -1
@@ -213,7 +213,7 @@ CFG_TEGRA_ENABLE_UARTA CFG_TEGRA_ENABLE_UARTD CFG_TEGRA_SLINK_CTRLS CFG_TEGRA_SPI -CONFIG_TEGRA_UARTA_GPU +CFG_TEGRA_UARTA_GPU CONFIG_TEGRA_UARTA_SDIO1 CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
Signature · 1 line
2.25.1
PATCH 205/241 global: Migrate CONFIG_TEGRA_UARTA_SDIO1 to CFG
In reply to Tom Rini--- arch/arm/mach-tegra/board.c | 2 +- include/configs/colibri_t20.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-tegra/board.c +1 -1
@@ -170,7 +170,7 @@ static int uart_configs[] = { FUNCMUX_UART1_UAA_UAB,#elif defined(CFG_TEGRA_UARTA_GPU ) FUNCMUX_UART1_GPU, -#elif defined(CONFIG_TEGRA_UARTA_SDIO1 ) +#elif defined(CFG_TEGRA_UARTA_SDIO1 )FUNCMUX_UART1_SDIO1 , #else FUNCMUX_UART1_IRRX_IRTX,
include/configs/colibri_t20.h +1 -1
@@ -12,7 +12,7 @@/* Board-specific serial config */ #define CFG_TEGRA_ENABLE_UARTA -#define CONFIG_TEGRA_UARTA_SDIO1 +#define CFG_TEGRA_UARTA_SDIO1 #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* NAND support */
scripts/config_whitelist.txt +1 -1
@@ -214,7 +214,7 @@ CFG_TEGRA_ENABLE_UARTD CFG_TEGRA_SLINK_CTRLS CFG_TEGRA_SPI CFG_TEGRA_UARTA_GPU -CONFIG_TEGRA_UARTA_SDIO1 +CFG_TEGRA_UARTA_SDIO1 CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 CONFIG_TESTPIN_MASK
Signature · 1 line
2.25.1
PATCH 206/241 global: Migrate CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 to CFG
In reply to Tom Rini--- arch/arm/mach-tegra/tegra30/cpu.c | 2 +- include/configs/cardhu.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-tegra/tegra30/cpu.c +1 -1
@@ -62,7 +62,7 @@ static void enable_cpu_power_rail(void)tegra_i2c_ll_write_addr (TPS62366A_I2C_ADDR ,2 );tegra_i2c_ll_write_data (TPS62366A_SET1_DATA ,I2C_SEND_2_BYTES );#endif -#ifdef CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 +#ifdef CFG_TEGRA_VDD_CORE_TPS62361B_SET3 tegra_i2c_ll_write_addr (TPS62361B_I2C_ADDR ,2 );tegra_i2c_ll_write_data (TPS62361B_SET3_DATA ,I2C_SEND_2_BYTES );#endif
include/configs/cardhu.h +1 -1
@@ -11,7 +11,7 @@#include "tegra30-common.h" /* VDD core PMIC */ -#define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 +#define CFG_TEGRA_VDD_CORE_TPS62361B_SET3 /* High-level configuration options */ #define CFG_TEGRA_BOARD_STRING "NVIDIA Cardhu"
scripts/config_whitelist.txt +1 -1
@@ -215,7 +215,7 @@ CFG_TEGRA_SLINK_CTRLS CFG_TEGRA_SPI CFG_TEGRA_UARTA_GPU CFG_TEGRA_UARTA_SDIO1 -CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 +CFG_TEGRA_VDD_CORE_TPS62361B_SET3 CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 CONFIG_TESTPIN_MASK CONFIG_TESTPIN_REG
Signature · 1 line
2.25.1
PATCH 207/241 global: Migrate CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 to CFG
In reply to Tom Rini--- arch/arm/mach-tegra/tegra30/cpu.c | 2 +- include/configs/beaver.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-tegra/tegra30/cpu.c +1 -1
@@ -58,7 +58,7 @@ static void enable_cpu_power_rail(void)writel (reg, &pmc->pmc_cntrl);/* Set VDD_CORE to 1.200V. */ -#ifdef CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 +#ifdef CFG_TEGRA_VDD_CORE_TPS62366A_SET1 tegra_i2c_ll_write_addr (TPS62366A_I2C_ADDR ,2 );tegra_i2c_ll_write_data (TPS62366A_SET1_DATA ,I2C_SEND_2_BYTES );#endif
include/configs/beaver.h +1 -1
@@ -11,7 +11,7 @@#include "tegra30-common.h" /* VDD core PMIC */ -#define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 +#define CFG_TEGRA_VDD_CORE_TPS62366A_SET1 /* High-level configuration options */ #define CFG_TEGRA_BOARD_STRING "NVIDIA Beaver"
scripts/config_whitelist.txt +1 -1
@@ -216,7 +216,7 @@ CFG_TEGRA_SPI CFG_TEGRA_UARTA_GPU CFG_TEGRA_UARTA_SDIO1 CFG_TEGRA_VDD_CORE_TPS62361B_SET3 -CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 +CFG_TEGRA_VDD_CORE_TPS62366A_SET1 CONFIG_TESTPIN_MASK CONFIG_TESTPIN_REG CONFIG_THOR_RESET_OFF
Signature · 1 line
2.25.1
PATCH 208/241 global: Migrate CONFIG_TESTPIN_MASK to CFG
In reply to Tom Rini--- board/keymile/km83xx/km83xx.c | 2 +- include/configs/kmcoge5ne.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
board/keymile/km83xx/km83xx.c +1 -1
@@ -217,7 +217,7 @@ int post_hotkeys_pressed(void)struct km_bec_fpga *base = (struct km_bec_fpga *)CFG_SYS_KMBEC_FPGA_BASE ;int testpin_reg =in_8 (&base->CONFIG_TESTPIN_REG); - testpin = (testpin_reg &CONFIG_TESTPIN_MASK ) !=0 ; + testpin = (testpin_reg &CFG_TESTPIN_MASK ) !=0 ;debug ("post_hotkeys_pressed: %d\n" , !testpin);return testpin; }
include/configs/kmcoge5ne.h +1 -1
@@ -37,6 +37,6 @@#define CFG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */ #define CPM_POST_WORD_ADDR CONFIG_SYS_MEMTEST_END#define CONFIG_TESTPIN_REG gprt3/* for kmcoge5ne */ -#define CONFIG_TESTPIN_MASK 0x20/* for kmcoge5ne */ +#define CFG_TESTPIN_MASK 0x20/* for kmcoge5ne */ #endif /* CONFIG */
scripts/config_whitelist.txt +1 -1
@@ -217,7 +217,7 @@ CFG_TEGRA_UARTA_GPU CFG_TEGRA_UARTA_SDIO1 CFG_TEGRA_VDD_CORE_TPS62361B_SET3 CFG_TEGRA_VDD_CORE_TPS62366A_SET1 -CONFIG_TESTPIN_MASK +CFG_TESTPIN_MASK CONFIG_TESTPIN_REG CONFIG_THOR_RESET_OFF CONFIG_TPM_TIS_BASE_ADDRESS
Signature · 1 line
2.25.1
PATCH 209/241 global: Migrate CONFIG_TESTPIN_REG to CFG
In reply to Tom Rini--- board/keymile/km83xx/km83xx.c | 2 +- include/configs/kmcoge5ne.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
board/keymile/km83xx/km83xx.c +1 -1
@@ -216,7 +216,7 @@ int post_hotkeys_pressed(void)int testpin =0 ;struct km_bec_fpga *base = (struct km_bec_fpga *)CFG_SYS_KMBEC_FPGA_BASE ; -int testpin_reg =in_8 (&base->CONFIG_TESTPIN_REG); +int testpin_reg =in_8 (&base->CFG_TESTPIN_REG); testpin = (testpin_reg &CFG_TESTPIN_MASK ) !=0 ;debug ("post_hotkeys_pressed: %d\n" , !testpin);return testpin;
include/configs/kmcoge5ne.h +1 -1
@@ -36,7 +36,7 @@#define CFG_POST (CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS)#define CFG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */ #define CPM_POST_WORD_ADDR CONFIG_SYS_MEMTEST_END -#define CONFIG_TESTPIN_REG gprt3/* for kmcoge5ne */ +#define CFG_TESTPIN_REG gprt3/* for kmcoge5ne */ #define CFG_TESTPIN_MASK 0x20/* for kmcoge5ne */ #endif /* CONFIG */
scripts/config_whitelist.txt +1 -1
@@ -218,7 +218,7 @@ CFG_TEGRA_UARTA_SDIO1 CFG_TEGRA_VDD_CORE_TPS62361B_SET3 CFG_TEGRA_VDD_CORE_TPS62366A_SET1 CFG_TESTPIN_MASK -CONFIG_TESTPIN_REG +CFG_TESTPIN_REG CONFIG_THOR_RESET_OFF CONFIG_TPM_TIS_BASE_ADDRESS CONFIG_TSEC1
Signature · 1 line
2.25.1
PATCH 210/241 global: Migrate CONFIG_THOR_RESET_OFF to CFG
In reply to Tom Rini--- drivers/usb/gadget/f_thor.c | 4 ++-- drivers/usb/gadget/f_thor.h | 2 +- include/configs/xilinx_versal.h | 2 +- include/configs/xilinx_versal_net.h | 2 +- include/configs/xilinx_zynqmp.h | 2 +- include/configs/zynq-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)
drivers/usb/gadget/f_thor.c +2 -2
@@ -129,7 +129,7 @@ static int process_rqt_cmd(const struct rqt_box *rqt)send_rsp (rsp);g_dnl_unregister ();dfu_free_entities (); -#ifdef CONFIG_THOR_RESET_OFF +#ifdef CFG_THOR_RESET_OFF return RESET_DONE ;#endif run_command ("reset" ,0 );
@@ -726,7 +726,7 @@ int thor_handle(void)if (ret >0 ) { ret =process_data (); -#ifdef CONFIG_THOR_RESET_OFF +#ifdef CFG_THOR_RESET_OFF if (ret ==RESET_DONE )break ;#endif
drivers/usb/gadget/f_thor.h +1 -1
@@ -120,7 +120,7 @@ struct f_thor {#define F_NAME_BUF_SIZE 32#define THOR_PACKET_SIZE SZ_1M/* 1 MiB */ #define THOR_STORE_UNIT_SIZE SZ_32M/* 32 MiB */ -#ifdef CONFIG_THOR_RESET_OFF +#ifdef CFG_THOR_RESET_OFF #define RESET_DONE 0xFFFFFFFF#endif #endif /* _USB_THOR_H_ */
include/configs/xilinx_versal.h +1 -1
@@ -25,7 +25,7 @@#if defined(CONFIG_CMD_DFU )#define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_THOR_RESET_OFF +#define CFG_THOR_RESET_OFF #endif /* Ethernet driver */
include/configs/xilinx_versal_net.h +1 -1
@@ -25,7 +25,7 @@#if defined(CONFIG_CMD_DFU )#define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_THOR_RESET_OFF +#define CFG_THOR_RESET_OFF #define DFU_ALT_INFO_RAM \ "dfu_ram_info=" \ "setenv dfu_alt_info " \
include/configs/xilinx_zynqmp.h +1 -1
@@ -31,7 +31,7 @@#if defined(CONFIG_ZYNQMP_USB )#define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_THOR_RESET_OFF +#define CFG_THOR_RESET_OFF # define PARTS_DEFAULT \ "partitions=uuid_disk=${uuid_gpt_disk};" \
include/configs/zynq-common.h +1 -1
@@ -41,7 +41,7 @@#ifdef CONFIG_USB_EHCI_ZYNQ # define DFU_DEFAULT_POLL_TIMEOUT 300 -# define CONFIG_THOR_RESET_OFF +# define CFG_THOR_RESET_OFF #endif /* enable preboot to be loaded before CONFIG_BOOTDELAY */
scripts/config_whitelist.txt +1 -1
@@ -219,7 +219,7 @@ CFG_TEGRA_VDD_CORE_TPS62361B_SET3 CFG_TEGRA_VDD_CORE_TPS62366A_SET1 CFG_TESTPIN_MASK CFG_TESTPIN_REG -CONFIG_THOR_RESET_OFF +CFG_THOR_RESET_OFF CONFIG_TPM_TIS_BASE_ADDRESS CONFIG_TSEC1 CONFIG_TSEC1_NAME
Signature · 1 line
2.25.1
PATCH 211/241 global: Migrate CONFIG_TPM_TIS_BASE_ADDRESS to CFG
In reply to Tom Rini--- README | 2 +- include/configs/efi-x86_app.h | 2 +- include/configs/x86-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
README +1 -1
@@ -585,7 +585,7 @@ 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 + CFG_TPM_TIS_BASE_ADDRESS Base address where the generic TPM device is mapped to. Contemporary x86 systems usually map it at 0xfed40000.
include/configs/efi-x86_app.h +1 -1
@@ -8,7 +8,7 @@#include <configs/x86-common.h> -#undef CONFIG_TPM_TIS_BASE_ADDRESS +#undef CFG_TPM_TIS_BASE_ADDRESS#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=vidconsole\0" \
include/configs/x86-common.h +1 -1
@@ -16,7 +16,7 @@*/ /* Generic TPM interfaced through LPC bus */ -#define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000 +#define CFG_TPM_TIS_BASE_ADDRESS 0xfed40000/*----------------------------------------------------------------------- * Serial Configuration
scripts/config_whitelist.txt +1 -1
@@ -220,7 +220,7 @@ CFG_TEGRA_VDD_CORE_TPS62366A_SET1 CFG_TESTPIN_MASK CFG_TESTPIN_REG CFG_THOR_RESET_OFF -CONFIG_TPM_TIS_BASE_ADDRESS +CFG_TPM_TIS_BASE_ADDRESS CONFIG_TSEC1 CONFIG_TSEC1_NAME CONFIG_TSEC2
Signature · 1 line
2.25.1
PATCH 212/241 global: Migrate CONFIG_TSEC1 to CFG
In reply to Tom Rini--- board/freescale/common/pixis.c | 2 +- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- board/freescale/p1010rdb/p1010rdb.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- drivers/net/tsec.c | 2 +- include/configs/MPC837XERDB.h | 6 +++--- include/configs/MPC8548CDS.h | 4 ++-- include/configs/P1010RDB.h | 4 ++-- include/configs/ls1021aiot.h | 4 ++-- include/configs/ls1021aqds.h | 4 ++-- include/configs/p1_p2_rdb_pc.h | 4 ++-- include/configs/socrates.h | 4 ++-- scripts/config_whitelist.txt | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-)
board/freescale/common/pixis.c +1 -1
@@ -296,7 +296,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc, which_tsec =simple_strtoul (argv[1 ],NULL ,0 );switch (which_tsec) { -#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 case 1 : mask =PIXIS_VSPEED2_TSEC1SER ; switch_mask =PIXIS_VCFGEN1_TSEC1SER ;
board/freescale/mpc8548cds/mpc8548cds.c +1 -1
@@ -208,7 +208,7 @@ int board_eth_init(struct bd_info *bis)struct tsec_info_struct tsec_info[4 ];int num =0 ; -#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 SET_STD_TSEC_INFO (tsec_info[num],1 ); num++;#endif
board/freescale/p1010rdb/p1010rdb.c +1 -1
@@ -489,7 +489,7 @@ int board_eth_init(struct bd_info *bis) cpu = gd->arch.cpu; -#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 SET_STD_TSEC_INFO (tsec_info[num],1 ); num++;#endif
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +1 -1
@@ -373,7 +373,7 @@ int board_eth_init(struct bd_info *bis) (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);int num =0 ; -#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 SET_STD_TSEC_INFO (tsec_info[num],1 ); num++;#endif
drivers/net/tsec.c +1 -1
@@ -26,7 +26,7 @@/* Default initializations for TSEC controllers. */ static struct tsec_info_struct tsec_info[] = { -#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 STD_TSEC_INFO(1), /* TSEC1 */#endif #ifdef CONFIG_TSEC2
include/configs/MPC837XERDB.h +3 -3
@@ -185,10 +185,10 @@#define CFG_GMII /* MII PHY management */ -#define CONFIG_TSEC1 +#define CFG_TSEC1 -#ifdef CONFIG_TSEC1 -#define CONFIG_TSEC1_NAME "TSEC0" +#ifdef CFG_TSEC1 +#define CFG_TSEC1_NAME "TSEC0"#define CFG_SYS_TSEC1_OFFSET 0x24000#define TSEC1_PHY_ADDR 2#define TSEC1_FLAGS (TSEC_GIGABIT | TSEC_REDUCED)
include/configs/MPC8548CDS.h +2 -2
@@ -285,8 +285,8 @@#if defined(CONFIG_TSEC_ENET ) -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC0" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "eTSEC0"#define CONFIG_TSEC2 1#define CONFIG_TSEC2_NAME "eTSEC1"#define CONFIG_TSEC3 1
include/configs/P1010RDB.h +2 -2
@@ -351,8 +351,8 @@ extern unsigned long get_sdram_size(void);#if defined(CONFIG_TSEC_ENET )#define CFG_MII_DEFAULT_TSEC 1/* Allow unregistered phys */ -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "eTSEC1"#define CONFIG_TSEC2 1#define CONFIG_TSEC2_NAME "eTSEC2"#define CONFIG_TSEC3 1
include/configs/ls1021aiot.h +2 -2
@@ -72,8 +72,8 @@#ifdef CONFIG_TSEC_ENET #define CFG_MII_DEFAULT_TSEC 1 -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "eTSEC1"#define CONFIG_TSEC2 1#define CONFIG_TSEC2_NAME "eTSEC2"
include/configs/ls1021aqds.h +2 -2
@@ -253,8 +253,8 @@#ifdef CONFIG_TSEC_ENET #define CFG_MII_DEFAULT_TSEC 3 -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "eTSEC1"#define CONFIG_TSEC2 1#define CONFIG_TSEC2_NAME "eTSEC2"#define CONFIG_TSEC3 1
include/configs/p1_p2_rdb_pc.h +2 -2
@@ -367,8 +367,8 @@#endif /* CONFIG_PCI */ #if defined(CONFIG_TSEC_ENET ) -#define CONFIG_TSEC1 -#define CONFIG_TSEC1_NAME "eTSEC1" +#define CFG_TSEC1 +#define CFG_TSEC1_NAME "eTSEC1"#define CONFIG_TSEC2 #define CONFIG_TSEC2_NAME "eTSEC2"#define CONFIG_TSEC3
include/configs/socrates.h +2 -2
@@ -111,8 +111,8 @@#define CFG_SYS_PCI1_MEM_PHYS 0x80000000#define CFG_SYS_PCI1_IO_PHYS 0xE2000000 -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "TSEC0" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "TSEC0"#define CONFIG_TSEC3 1#define CONFIG_TSEC3_NAME "TSEC1"#undef CONFIG_MPC85XX_FEC
scripts/config_whitelist.txt +2 -2
@@ -221,8 +221,8 @@ CFG_TESTPIN_MASK CFG_TESTPIN_REG CFG_THOR_RESET_OFF CFG_TPM_TIS_BASE_ADDRESS -CONFIG_TSEC1 -CONFIG_TSEC1_NAME +CFG_TSEC1 +CFG_TSEC1_NAME CONFIG_TSEC2 CONFIG_TSEC2_NAME CONFIG_TSEC3
Signature · 1 line
2.25.1
PATCH 213/241 global: Migrate CONFIG_TSEC2 to CFG
In reply to Tom Rini--- board/freescale/common/pixis.c | 2 +- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- board/freescale/p1010rdb/p1010rdb.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- drivers/net/tsec.c | 2 +- include/configs/MPC837XERDB.h | 6 +++--- include/configs/MPC8548CDS.h | 4 ++-- include/configs/P1010RDB.h | 4 ++-- include/configs/ls1021aiot.h | 4 ++-- include/configs/ls1021aqds.h | 4 ++-- include/configs/p1_p2_rdb_pc.h | 4 ++-- scripts/config_whitelist.txt | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-)
board/freescale/common/pixis.c +1 -1
@@ -302,7 +302,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc, switch_mask =PIXIS_VCFGEN1_TSEC1SER ;break ;#endif -#ifdef CONFIG_TSEC2 +#ifdef CFG_TSEC2 case 2 : mask =PIXIS_VSPEED2_TSEC2SER ; switch_mask =PIXIS_VCFGEN1_TSEC2SER ;
board/freescale/mpc8548cds/mpc8548cds.c +1 -1
@@ -212,7 +212,7 @@ int board_eth_init(struct bd_info *bis)SET_STD_TSEC_INFO (tsec_info[num],1 ); num++;#endif -#ifdef CONFIG_TSEC2 +#ifdef CFG_TSEC2 SET_STD_TSEC_INFO (tsec_info[num],2 ); num++;#endif
board/freescale/p1010rdb/p1010rdb.c +1 -1
@@ -493,7 +493,7 @@ int board_eth_init(struct bd_info *bis)SET_STD_TSEC_INFO (tsec_info[num],1 ); num++;#endif -#ifdef CONFIG_TSEC2 +#ifdef CFG_TSEC2 SET_STD_TSEC_INFO (tsec_info[num],2 ); num++;#endif
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +1 -1
@@ -377,7 +377,7 @@ int board_eth_init(struct bd_info *bis)SET_STD_TSEC_INFO (tsec_info[num],1 ); num++;#endif -#ifdef CONFIG_TSEC2 +#ifdef CFG_TSEC2 SET_STD_TSEC_INFO (tsec_info[num],2 );if (is_serdes_configured (SGMII_TSEC2 )) {printf ("eTSEC2 is in sgmii mode.\n" );
drivers/net/tsec.c +1 -1
@@ -29,7 +29,7 @@ static struct tsec_info_struct tsec_info[] = {#ifdef CFG_TSEC1 STD_TSEC_INFO(1), /* TSEC1 */#endif -#ifdef CONFIG_TSEC2 +#ifdef CFG_TSEC2 STD_TSEC_INFO(2), /* TSEC2 */#endif #ifdef CONFIG_MPC85XX_FEC
include/configs/MPC837XERDB.h +3 -3
@@ -41,7 +41,7 @@#ifdef CONFIG_VSC7385_ENET -#define CONFIG_TSEC2 +#define CFG_TSEC2 /* The flash address and size of the VSC7385 firmware image */ #define CONFIG_VSC7385_IMAGE 0xFE7FE000
@@ -195,8 +195,8 @@#define TSEC1_PHYIDX 0#endif -#ifdef CONFIG_TSEC2 -#define CONFIG_TSEC2_NAME "TSEC1" +#ifdef CFG_TSEC2 +#define CFG_TSEC2_NAME "TSEC1"#define TSEC2_PHY_ADDR 0x1c#define TSEC2_FLAGS (TSEC_GIGABIT | TSEC_REDUCED)#define TSEC2_PHYIDX 0
include/configs/MPC8548CDS.h +2 -2
@@ -287,8 +287,8 @@#define CFG_TSEC1 1#define CFG_TSEC1_NAME "eTSEC0" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC1" +#define CFG_TSEC2 1 +#define CFG_TSEC2_NAME "eTSEC1"#define CONFIG_TSEC3 1#define CONFIG_TSEC3_NAME "eTSEC2"#define CONFIG_TSEC4
include/configs/P1010RDB.h +2 -2
@@ -353,8 +353,8 @@ extern unsigned long get_sdram_size(void);#define CFG_MII_DEFAULT_TSEC 1/* Allow unregistered phys */ #define CFG_TSEC1 1#define CFG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC2" +#define CFG_TSEC2 1 +#define CFG_TSEC2_NAME "eTSEC2"#define CONFIG_TSEC3 1#define CONFIG_TSEC3_NAME "eTSEC3"
include/configs/ls1021aiot.h +2 -2
@@ -74,8 +74,8 @@#define CFG_MII_DEFAULT_TSEC 1#define CFG_TSEC1 1#define CFG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC2" +#define CFG_TSEC2 1 +#define CFG_TSEC2_NAME "eTSEC2"#define TSEC1_PHY_ADDR 1#define TSEC2_PHY_ADDR 3
include/configs/ls1021aqds.h +2 -2
@@ -255,8 +255,8 @@#define CFG_MII_DEFAULT_TSEC 3#define CFG_TSEC1 1#define CFG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC2" +#define CFG_TSEC2 1 +#define CFG_TSEC2_NAME "eTSEC2"#define CONFIG_TSEC3 1#define CONFIG_TSEC3_NAME "eTSEC3"
include/configs/p1_p2_rdb_pc.h +2 -2
@@ -369,8 +369,8 @@#if defined(CONFIG_TSEC_ENET )#define CFG_TSEC1 #define CFG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 -#define CONFIG_TSEC2_NAME "eTSEC2" +#define CFG_TSEC2 +#define CFG_TSEC2_NAME "eTSEC2"#define CONFIG_TSEC3 #define CONFIG_TSEC3_NAME "eTSEC3"
scripts/config_whitelist.txt +2 -2
@@ -223,8 +223,8 @@ CFG_THOR_RESET_OFF CFG_TPM_TIS_BASE_ADDRESS CFG_TSEC1 CFG_TSEC1_NAME -CONFIG_TSEC2 -CONFIG_TSEC2_NAME +CFG_TSEC2 +CFG_TSEC2_NAME CONFIG_TSEC3 CONFIG_TSEC3_NAME CONFIG_TSEC4
Signature · 1 line
2.25.1
PATCH 214/241 global: Migrate CONFIG_TSEC3 to CFG
In reply to Tom Rini--- board/freescale/common/pixis.c | 2 +- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- board/freescale/p1010rdb/p1010rdb.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- drivers/net/tsec.c | 2 +- include/configs/MPC8548CDS.h | 4 ++-- include/configs/P1010RDB.h | 4 ++-- include/configs/ls1021aqds.h | 4 ++-- include/configs/p1_p2_rdb_pc.h | 4 ++-- include/configs/socrates.h | 4 ++-- scripts/config_whitelist.txt | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-)
board/freescale/common/pixis.c +1 -1
@@ -308,7 +308,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc, switch_mask =PIXIS_VCFGEN1_TSEC2SER ;break ;#endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 case 3 : mask =PIXIS_VSPEED2_TSEC3SER ; switch_mask =PIXIS_VCFGEN1_TSEC3SER ;
board/freescale/mpc8548cds/mpc8548cds.c +1 -1
@@ -216,7 +216,7 @@ int board_eth_init(struct bd_info *bis)SET_STD_TSEC_INFO (tsec_info[num],2 ); num++;#endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 /* initialize TSEC3 only if Carrier is 1.3 or above on CDS */ if (get_board_version () >=0x13 ) {SET_STD_TSEC_INFO (tsec_info[num],3 );
board/freescale/p1010rdb/p1010rdb.c +1 -1
@@ -497,7 +497,7 @@ int board_eth_init(struct bd_info *bis)SET_STD_TSEC_INFO (tsec_info[num],2 ); num++;#endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 /* P1014 and it's derivatives do not support eTSEC3 */ if (cpu->soc_ver !=SVR_P1014 ) {SET_STD_TSEC_INFO (tsec_info[num],3 );
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +1 -1
@@ -385,7 +385,7 @@ int board_eth_init(struct bd_info *bis) } num++;#endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 SET_STD_TSEC_INFO (tsec_info[num],3 ); num++;#endif
drivers/net/tsec.c +1 -1
@@ -41,7 +41,7 @@ static struct tsec_info_struct tsec_info[] = { .mii_devname = DEFAULT_MII_NAME }, /* FEC */#endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 STD_TSEC_INFO(3), /* TSEC3 */#endif #ifdef CONFIG_TSEC4
include/configs/MPC8548CDS.h +2 -2
@@ -289,8 +289,8 @@#define CFG_TSEC1_NAME "eTSEC0"#define CFG_TSEC2 1#define CFG_TSEC2_NAME "eTSEC1" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC2" +#define CFG_TSEC3 1 +#define CFG_TSEC3_NAME "eTSEC2"#define CONFIG_TSEC4 #define CONFIG_TSEC4_NAME "eTSEC3"#undef CONFIG_MPC85XX_FEC
include/configs/P1010RDB.h +2 -2
@@ -355,8 +355,8 @@ extern unsigned long get_sdram_size(void);#define CFG_TSEC1_NAME "eTSEC1"#define CFG_TSEC2 1#define CFG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC3" +#define CFG_TSEC3 1 +#define CFG_TSEC3_NAME "eTSEC3"#define TSEC1_PHY_ADDR 1#define TSEC2_PHY_ADDR 0
include/configs/ls1021aqds.h +2 -2
@@ -257,8 +257,8 @@#define CFG_TSEC1_NAME "eTSEC1"#define CFG_TSEC2 1#define CFG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC3" +#define CFG_TSEC3 1 +#define CFG_TSEC3_NAME "eTSEC3"#define TSEC1_PHY_ADDR 1#define TSEC2_PHY_ADDR 2
include/configs/p1_p2_rdb_pc.h +2 -2
@@ -371,8 +371,8 @@#define CFG_TSEC1_NAME "eTSEC1"#define CFG_TSEC2 #define CFG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 -#define CONFIG_TSEC3_NAME "eTSEC3" +#define CFG_TSEC3 +#define CFG_TSEC3_NAME "eTSEC3"#define TSEC1_PHY_ADDR 2#define TSEC2_PHY_ADDR 0
include/configs/socrates.h +2 -2
@@ -113,8 +113,8 @@#define CFG_TSEC1 1#define CFG_TSEC1_NAME "TSEC0" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "TSEC1" +#define CFG_TSEC3 1 +#define CFG_TSEC3_NAME "TSEC1"#undef CONFIG_MPC85XX_FEC#define TSEC1_PHY_ADDR 0
scripts/config_whitelist.txt +2 -2
@@ -225,8 +225,8 @@ CFG_TSEC1 CFG_TSEC1_NAME CFG_TSEC2 CFG_TSEC2_NAME -CONFIG_TSEC3 -CONFIG_TSEC3_NAME +CFG_TSEC3 +CFG_TSEC3_NAME CONFIG_TSEC4 CONFIG_TSEC4_NAME CONFIG_TSECV2
Signature · 1 line
2.25.1
PATCH 215/241 global: Migrate CONFIG_TSEC4 to CFG
In reply to Tom Rini--- board/freescale/common/pixis.c | 2 +- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- drivers/net/tsec.c | 2 +- include/configs/MPC8548CDS.h | 4 ++-- scripts/config_whitelist.txt | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-)
board/freescale/common/pixis.c +1 -1
@@ -314,7 +314,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc, switch_mask =PIXIS_VCFGEN1_TSEC3SER ;break ;#endif -#ifdef CONFIG_TSEC4 +#ifdef CFG_TSEC4 case 4 : mask =PIXIS_VSPEED2_TSEC4SER ; switch_mask =PIXIS_VCFGEN1_TSEC4SER ;
board/freescale/mpc8548cds/mpc8548cds.c +1 -1
@@ -224,7 +224,7 @@ int board_eth_init(struct bd_info *bis) num++; }#endif -#ifdef CONFIG_TSEC4 +#ifdef CFG_TSEC4 /* initialize TSEC4 only if Carrier is 1.3 or above on CDS */ if (get_board_version () >=0x13 ) {SET_STD_TSEC_INFO (tsec_info[num],4 );
drivers/net/tsec.c +1 -1
@@ -44,7 +44,7 @@ static struct tsec_info_struct tsec_info[] = {#ifdef CFG_TSEC3 STD_TSEC_INFO(3), /* TSEC3 */#endif -#ifdef CONFIG_TSEC4 +#ifdef CFG_TSEC4 STD_TSEC_INFO(4), /* TSEC4 */#endif };
include/configs/MPC8548CDS.h +2 -2
@@ -291,8 +291,8 @@#define CFG_TSEC2_NAME "eTSEC1"#define CFG_TSEC3 1#define CFG_TSEC3_NAME "eTSEC2" -#define CONFIG_TSEC4 -#define CONFIG_TSEC4_NAME "eTSEC3" +#define CFG_TSEC4 +#define CFG_TSEC4_NAME "eTSEC3"#undef CONFIG_MPC85XX_FEC#define TSEC1_PHY_ADDR 0
scripts/config_whitelist.txt +2 -2
@@ -227,8 +227,8 @@ CFG_TSEC2 CFG_TSEC2_NAME CFG_TSEC3 CFG_TSEC3_NAME -CONFIG_TSEC4 -CONFIG_TSEC4_NAME +CFG_TSEC4 +CFG_TSEC4_NAME CONFIG_TSECV2 CONFIG_TSECV2_1 CONFIG_TSEC_TBICR_SETTINGS
Signature · 1 line
2.25.1
PATCH 216/241 global: Migrate CONFIG_TSECV2 to CFG
In reply to Tom Rini--- arch/powerpc/include/asm/config_mpc85xx.h | 18 +++++++++--------- arch/powerpc/include/asm/immap_85xx.h | 4 ++-- scripts/config_whitelist.txt | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-)
arch/powerpc/include/asm/config_mpc85xx.h +9 -9
@@ -24,18 +24,18 @@#elif defined(CONFIG_ARCH_P1010 )#define CFG_FSL_SDHC_V2_3 -#define CONFIG_TSECV2 +#define CFG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 4/* P1011 is single core version of P1020 */ #elif defined(CONFIG_ARCH_P1011 ) -#define CONFIG_TSECV2 +#define CFG_TSECV2 #elif defined(CONFIG_ARCH_P1020 ) -#define CONFIG_TSECV2 +#define CFG_TSECV2 #elif defined(CONFIG_ARCH_P1021 ) -#define CONFIG_TSECV2 +#define CFG_TSECV2 #define QE_MURAM_SIZE 0x6000UL#define MAX_QE_RISC 1#define QE_NUM_OF_SNUM 28
@@ -49,11 +49,11 @@/* P1024 is lower end variant of P1020 */ #elif defined(CONFIG_ARCH_P1024 ) -#define CONFIG_TSECV2 +#define CFG_TSECV2 /* P1025 is lower end variant of P1021 */ #elif defined(CONFIG_ARCH_P1025 ) -#define CONFIG_TSECV2 +#define CFG_TSECV2 #define QE_MURAM_SIZE 0x6000UL#define MAX_QE_RISC 1#define QE_NUM_OF_SNUM 28
@@ -108,12 +108,12 @@#elif defined(CONFIG_ARCH_BSC9131 )#define CFG_FSL_SDHC_V2_3 -#define CONFIG_TSECV2 +#define CFG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 3#elif defined(CONFIG_ARCH_BSC9132 )#define CFG_FSL_SDHC_V2_3 -#define CONFIG_TSECV2 +#define CFG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 3#elif defined(CONFIG_ARCH_T4240 )
@@ -221,7 +221,7 @@#elif defined(CONFIG_ARCH_C29X )#define CFG_FSL_SDHC_V2_3 -#define CONFIG_TSECV2_1 +#define CFG_TSECV2_1 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8#define CFG_SYS_FSL_SEC_IDX_OFFSET 0x20000
arch/powerpc/include/asm/immap_85xx.h +2 -2
@@ -2541,9 +2541,9 @@ struct ccsr_pman {#define CFG_SYS_MPC85xx_USB2_OFFSET 0x23000#define CFG_SYS_MPC85xx_USB1_PHY_OFFSET 0xE5000#define CFG_SYS_MPC85xx_USB2_PHY_OFFSET 0xE5100 -#ifdef CONFIG_TSECV2 +#ifdef CFG_TSECV2 #define CFG_SYS_TSEC1_OFFSET 0xB0000 -#elif defined(CONFIG_TSECV2_1 ) +#elif defined(CFG_TSECV2_1 )#define CFG_SYS_TSEC1_OFFSET 0x10000#else #define CFG_SYS_TSEC1_OFFSET 0x24000
scripts/config_whitelist.txt +2 -2
@@ -229,8 +229,8 @@ CFG_TSEC3 CFG_TSEC3_NAME CFG_TSEC4 CFG_TSEC4_NAME -CONFIG_TSECV2 -CONFIG_TSECV2_1 +CFG_TSECV2 +CFG_TSECV2_1 CONFIG_TSEC_TBICR_SETTINGS CONFIG_UBIFS_VOLUME CONFIG_UBI_PART
Signature · 1 line
2.25.1
PATCH 217/241 global: Migrate CONFIG_TSEC_TBICR_SETTINGS to CFG
In reply to Tom Rini--- drivers/net/tsec.c | 8 ++++---- include/configs/P1010RDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/tsec.c +4 -4
@@ -57,14 +57,14 @@ static struct tsec_info_struct tsec_info[] = { )/* By default force the TBI PHY into 1000Mbps full duplex when in SGMII mode */ -#ifndef CONFIG_TSEC_TBICR_SETTINGS -#define CONFIG_TSEC_TBICR_SETTINGS ( \ +#ifndef CFG_TSEC_TBICR_SETTINGS +#define CFG_TSEC_TBICR_SETTINGS ( \ TBICR_PHY_RESET \ | TBICR_ANEG_ENABLE \ | TBICR_FULL_DUPLEX \ | TBICR_SPEED1_SET \ ) -#endif /* CONFIG_TSEC_TBICR_SETTINGS */ +#endif /* CFG_TSEC_TBICR_SETTINGS */ /* Configure the TBI for SGMII operation */ static void tsec_configure_serdes (struct tsec_private *priv)
@@ -78,7 +78,7 @@ static void tsec_configure_serdes(struct tsec_private *priv)tsec_local_mdio_write (priv->phyregs_sgmii,in_be32 (&priv->regs->tbipa),0 ,TBI_TBICON ,TBICON_CLK_SELECT );tsec_local_mdio_write (priv->phyregs_sgmii,in_be32 (&priv->regs->tbipa), -0 ,TBI_CR ,CONFIG_TSEC_TBICR_SETTINGS ); +0 ,TBI_CR ,CFG_TSEC_TBICR_SETTINGS ); }/* the 'way' for ethernet-CRC-32. Spliced in from Linux lib/crc32.c
include/configs/P1010RDB.h +1 -1
@@ -371,7 +371,7 @@ extern unsigned long get_sdram_size(void);#define TSEC3_PHYIDX 0/* TBI PHY configuration for SGMII mode */ -#define CONFIG_TSEC_TBICR_SETTINGS ( \ +#define CFG_TSEC_TBICR_SETTINGS ( \ TBICR_PHY_RESET \ | TBICR_ANEG_ENABLE \ | TBICR_FULL_DUPLEX \
scripts/config_whitelist.txt +1 -1
@@ -231,7 +231,7 @@ CFG_TSEC4 CFG_TSEC4_NAME CFG_TSECV2 CFG_TSECV2_1 -CONFIG_TSEC_TBICR_SETTINGS +CFG_TSEC_TBICR_SETTINGS CONFIG_UBIFS_VOLUME CONFIG_UBI_PART CONFIG_UBOOTPATH
Signature · 1 line
2.25.1
PATCH 218/241 global: Migrate CONFIG_UBIFS_VOLUME to CFG
In reply to Tom Rini--- include/configs/x530.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/x530.h +1 -1
@@ -54,6 +54,6 @@ "initrd_high=0x10000000\0"#define CONFIG_UBI_PART user -#define CONFIG_UBIFS_VOLUME user +#define CFG_UBIFS_VOLUME user#endif /* _CONFIG_X530_H */
scripts/config_whitelist.txt +1 -1
@@ -232,7 +232,7 @@ CFG_TSEC4_NAME CFG_TSECV2 CFG_TSECV2_1 CFG_TSEC_TBICR_SETTINGS -CONFIG_UBIFS_VOLUME +CFG_UBIFS_VOLUME CONFIG_UBI_PART CONFIG_UBOOTPATH CONFIG_UBOOT_SECTOR_COUNT
Signature · 1 line
2.25.1
PATCH 219/241 global: Migrate CONFIG_UBI_PART to CFG
In reply to Tom Rini--- include/configs/x530.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/x530.h +1 -1
@@ -53,7 +53,7 @@"fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0" -#define CONFIG_UBI_PART user +#define CFG_UBI_PART user#define CFG_UBIFS_VOLUME user#endif /* _CONFIG_X530_H */
scripts/config_whitelist.txt +1 -1
@@ -233,7 +233,7 @@ CFG_TSECV2 CFG_TSECV2_1 CFG_TSEC_TBICR_SETTINGS CFG_UBIFS_VOLUME -CONFIG_UBI_PART +CFG_UBI_PART CONFIG_UBOOTPATH CONFIG_UBOOT_SECTOR_COUNT CONFIG_UBOOT_SECTOR_START
Signature · 1 line
2.25.1
PATCH 220/241 global: Migrate CONFIG_UBOOTPATH to CFG
In reply to Tom Rini--- include/configs/MPC837XERDB.h | 4 ++-- include/configs/MPC8548CDS.h | 4 ++-- include/configs/P1010RDB.h | 4 ++-- include/configs/P2041RDB.h | 4 ++-- include/configs/T102xRDB.h | 4 ++-- include/configs/T104xRDB.h | 4 ++-- include/configs/T208xQDS.h | 4 ++-- include/configs/T208xRDB.h | 4 ++-- include/configs/T4240RDB.h | 4 ++-- include/configs/p1_p2_rdb_pc.h | 4 ++-- include/configs/qemu-ppce500.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-)
include/configs/MPC837XERDB.h +2 -2
@@ -228,12 +228,12 @@#define CFG_HOSTNAME "mpc837x_rdb"#define CFG_ROOTPATH "/nfsroot"/* U-Boot image on TFTP server */ -#define CONFIG_UBOOTPATH "u-boot.bin" +#define CFG_UBOOTPATH "u-boot.bin"#define CFG_FDTFILE "mpc8379_rdb.dtb"#define CFG_EXTRA_ENV_SETTINGS \ "netdev=" CFG_NETDEV "\0" \ - "uboot=" CONFIG_UBOOTPATH "\0" \ + "uboot=" CFG_UBOOTPATH "\0" \ "tftpflash=tftp $loadaddr $uboot;" \ "protect off " __stringify(CONFIG_TEXT_BASE) \ " +$filesize; " \
include/configs/MPC8548CDS.h +2 -2
@@ -329,7 +329,7 @@#define CFG_HOSTNAME "unknown"#define CFG_ROOTPATH "/nfsroot" -#define CONFIG_UBOOTPATH 8548cds/u-boot.bin/* TFTP server */ +#define CFG_UBOOTPATH 8548cds/u-boot.bin/* TFTP server */ #define CFG_SERVERIP 192.168.1.1#define CFG_GATEWAYIP 192.168.1.1
@@ -338,7 +338,7 @@#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ecc=off\0" \ "netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ "protect off " __stringify(CONFIG_TEXT_BASE) \ " +$filesize; " \
include/configs/P1010RDB.h +2 -2
@@ -413,12 +413,12 @@ extern unsigned long get_sdram_size(void);*/ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */ +#define CFG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */ #define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \ "netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "loadaddr=1000000\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \
include/configs/P2041RDB.h +2 -2
@@ -309,7 +309,7 @@* Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH u-boot.bin +#define CFG_UBOOTPATH u-boot.bin#define __USB_PHY_TYPE utmi
@@ -317,7 +317,7 @@"hwconfig=fsl_ddr:ctlr_intlv=cacheline," \"bank_intlv=cs0_cs1\0" \"netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \"tftpflash=tftpboot $loadaddr $uboot && " \"protect off $ubootaddr +$filesize && " \
include/configs/T102xRDB.h +2 -2
@@ -424,7 +424,7 @@* Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */ +#define CFG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */ #define __USB_PHY_TYPE utmi#ifdef CONFIG_ARCH_T1024
@@ -443,7 +443,7 @@ARCH_EXTRA_ENV_SETTINGS \"hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \"bootargs=root=/dev/ram rw console=ttyS0,115200\0" \"netdev=eth0\0" \
include/configs/T104xRDB.h +2 -2
@@ -414,7 +414,7 @@* Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH "u-boot.bin"/* U-Boot image on TFTP server*/ +#define CFG_UBOOTPATH "u-boot.bin"/* U-Boot image on TFTP server*/ #define __USB_PHY_TYPE utmi#define RAMDISKFILE "t104xrdb/ramdisk.uboot"
@@ -436,7 +436,7 @@ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\ "usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\"netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \"tftpflash=tftpboot $loadaddr $uboot && " \"protect off $ubootaddr +$filesize && " \
include/configs/T208xQDS.h +2 -2
@@ -422,7 +422,7 @@* Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH "u-boot.bin"/* U-Boot image on TFTP server */ +#define CFG_UBOOTPATH "u-boot.bin"/* U-Boot image on TFTP server */ #define __USB_PHY_TYPE utmi
@@ -432,7 +432,7 @@"bank_intlv=auto;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\"netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \"tftpflash=tftpboot $loadaddr $uboot && " \"protect off $ubootaddr +$filesize && " \
include/configs/T208xRDB.h +2 -2
@@ -388,7 +388,7 @@* Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH "u-boot.bin"/* U-Boot image on TFTP server */ +#define CFG_UBOOTPATH "u-boot.bin"/* U-Boot image on TFTP server */ #define __USB_PHY_TYPE utmi
@@ -398,7 +398,7 @@"bank_intlv=auto;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\"netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \"tftpflash=tftpboot $loadaddr $uboot && " \"protect off $ubootaddr +$filesize && " \
include/configs/T4240RDB.h +2 -2
@@ -139,7 +139,7 @@* Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH "u-boot.bin"/* U-Boot image on TFTP server*/ +#define CFG_UBOOTPATH "u-boot.bin"/* U-Boot image on TFTP server*/ #define HVBOOT \ "setenv bootargs config-addr=0x60000000; " \
@@ -388,7 +388,7 @@"bank_intlv=auto;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\"netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \"tftpflash=tftpboot $loadaddr $uboot && " \"protect off $ubootaddr +$filesize && " \
include/configs/p1_p2_rdb_pc.h +2 -2
@@ -420,13 +420,13 @@*/ #define CFG_HOSTNAME "unknown"#define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */ +#define CFG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */ #include "p1_p2_bootsrc.h" #define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ -"uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ +"uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "loadaddr=1000000\0" \ "bootfile=uImage\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \
include/configs/qemu-ppce500.h +1 -1
@@ -59,6 +59,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);* Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH "u-boot.bin"/* U-Boot image on TFTP server*/ +#define CFG_UBOOTPATH "u-boot.bin"/* U-Boot image on TFTP server*/ #endif /* __QEMU_PPCE500_H */
scripts/config_whitelist.txt +1 -1
@@ -234,7 +234,7 @@ CFG_TSECV2_1 CFG_TSEC_TBICR_SETTINGS CFG_UBIFS_VOLUME CFG_UBI_PART -CONFIG_UBOOTPATH +CFG_UBOOTPATH CONFIG_UBOOT_SECTOR_COUNT CONFIG_UBOOT_SECTOR_START CONFIG_UEC_ETH
Signature · 1 line
2.25.1
PATCH 221/241 global: Migrate CONFIG_UBOOT_SECTOR_COUNT to CFG
In reply to Tom Rini--- include/configs/xpress.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
include/configs/xpress.h +2 -2
@@ -35,7 +35,7 @@#define CFG_FEC_MXC_PHYADDR 0x0#define CONFIG_UBOOT_SECTOR_START 0x2 -#define CONFIG_UBOOT_SECTOR_COUNT 0x3fe +#define CFG_UBOOT_SECTOR_COUNT 0x3fe#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \
@@ -76,7 +76,7 @@"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_size="__stringify(CFG_UBOOT_SECTOR_COUNT)"\0" \"update_uboot=if tftp ${uboot}; then " \"if itest ${filesize} > 0; then " \"mmc dev 0 1;" \
scripts/config_whitelist.txt +1 -1
@@ -235,7 +235,7 @@ CFG_TSEC_TBICR_SETTINGS CFG_UBIFS_VOLUME CFG_UBI_PART CFG_UBOOTPATH -CONFIG_UBOOT_SECTOR_COUNT +CFG_UBOOT_SECTOR_COUNT CONFIG_UBOOT_SECTOR_START CONFIG_UEC_ETH CONFIG_USART_BASE
Signature · 1 line
2.25.1
PATCH 222/241 global: Migrate CONFIG_UBOOT_SECTOR_START to CFG
In reply to Tom Rini--- include/configs/xpress.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
include/configs/xpress.h +2 -2
@@ -34,7 +34,7 @@#define CFG_FEC_ENET_DEV 0#define CFG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_UBOOT_SECTOR_START 0x2 +#define CFG_UBOOT_SECTOR_START 0x2#define CFG_UBOOT_SECTOR_COUNT 0x3fe#define CFG_EXTRA_ENV_SETTINGS \
@@ -75,7 +75,7 @@"bootz; " \"fi;\0" \"uboot=ccv/u-boot.imx\0" \ - "uboot_start="__stringify(CONFIG_UBOOT_SECTOR_START)"\0" \ + "uboot_start="__stringify(CFG_UBOOT_SECTOR_START)"\0" \ "uboot_size="__stringify(CFG_UBOOT_SECTOR_COUNT)"\0" \"update_uboot=if tftp ${uboot}; then " \"if itest ${filesize} > 0; then " \
scripts/config_whitelist.txt +1 -1
@@ -236,7 +236,7 @@ CFG_UBIFS_VOLUME CFG_UBI_PART CFG_UBOOTPATH CFG_UBOOT_SECTOR_COUNT -CONFIG_UBOOT_SECTOR_START +CFG_UBOOT_SECTOR_START CONFIG_UEC_ETH CONFIG_USART_BASE CONFIG_USART_ID
Signature · 1 line
2.25.1
PATCH 223/241 global: Migrate CONFIG_UEC_ETH to CFG
In reply to Tom Rini--- arch/powerpc/cpu/mpc83xx/cpu.c | 2 +- arch/powerpc/cpu/mpc8xxx/cpu.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- drivers/qe/uec.c | 16 ++++++++-------- include/configs/km/km-mpc83xx.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-)
arch/powerpc/cpu/mpc83xx/cpu.c +1 -1
@@ -187,7 +187,7 @@ void watchdog_reset (void)*/ int cpu_eth_init (struct bd_info *bis) { -#if defined(CONFIG_UEC_ETH ) +#if defined(CFG_UEC_ETH )uec_standard_init (bis);#endif
arch/powerpc/cpu/mpc8xxx/cpu.c +1 -1
@@ -351,7 +351,7 @@ int fixup_cpu(void)*/ int cpu_eth_init (struct bd_info *bis) { -#if defined(CONFIG_UEC_ETH ) +#if defined(CFG_UEC_ETH )uec_standard_init (bis);#endif
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +1 -1
@@ -402,7 +402,7 @@ int board_eth_init(struct bd_info *bis)tsec_eth_init (bis, tsec_info, num); -#if defined(CONFIG_UEC_ETH ) +#if defined(CFG_UEC_ETH )/* QE0 and QE3 need to be exposed for UCC1 and UCC5 Eth mode */ setbits_be32 (&gur->pmuxcr, MPC85xx_PMUXCR_QE0);setbits_be32 (&gur->pmuxcr, MPC85xx_PMUXCR_QE3);
drivers/qe/uec.c +8 -8
@@ -27,28 +27,28 @@#endif static struct uec_inf uec_info[] = { -#ifdef CONFIG_UEC_ETH1 +#ifdef CFG_UEC_ETH1 STD_UEC_INFO(1), /* UEC1 */#endif -#ifdef CONFIG_UEC_ETH2 +#ifdef CFG_UEC_ETH2 STD_UEC_INFO(2), /* UEC2 */#endif -#ifdef CONFIG_UEC_ETH3 +#ifdef CFG_UEC_ETH3 STD_UEC_INFO(3), /* UEC3 */#endif -#ifdef CONFIG_UEC_ETH4 +#ifdef CFG_UEC_ETH4 STD_UEC_INFO(4), /* UEC4 */#endif -#ifdef CONFIG_UEC_ETH5 +#ifdef CFG_UEC_ETH5 STD_UEC_INFO(5), /* UEC5 */#endif -#ifdef CONFIG_UEC_ETH6 +#ifdef CFG_UEC_ETH6 STD_UEC_INFO(6), /* UEC6 */#endif -#ifdef CONFIG_UEC_ETH7 +#ifdef CFG_UEC_ETH7 STD_UEC_INFO(7), /* UEC7 */#endif -#ifdef CONFIG_UEC_ETH8 +#ifdef CFG_UEC_ETH8 STD_UEC_INFO(8), /* UEC8 */#endif };
include/configs/km/km-mpc83xx.h +1 -1
@@ -94,4 +94,4 @@/* * QE UEC ethernet configuration */ -#define CONFIG_UEC_ETH +#define CFG_UEC_ETH
scripts/config_whitelist.txt +1 -1
@@ -237,7 +237,7 @@ CFG_UBI_PART CFG_UBOOTPATH CFG_UBOOT_SECTOR_COUNT CFG_UBOOT_SECTOR_START -CONFIG_UEC_ETH +CFG_UEC_ETH CONFIG_USART_BASE CONFIG_USART_ID CONFIG_USBD_HS
Signature · 1 line
2.25.1
PATCH 224/241 global: Migrate CONFIG_USART_BASE to CFG
In reply to Tom Rini--- drivers/serial/atmel_usart.c | 10 +++++----- include/configs/corvus.h | 2 +- include/configs/sam9x60_curiosity.h | 2 +- include/configs/sam9x60ek.h | 2 +- include/configs/smartweb.h | 2 +- include/configs/taurus.h | 2 +- include/configs/vinco.h | 2 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-)
drivers/serial/atmel_usart.c +5 -5
@@ -72,13 +72,13 @@ static void atmel_serial_activate(atmel_usart3_t *usart)static void atmel_serial_setbrg (void ) { -atmel_serial_setbrg_internal ((atmel_usart3_t *)CONFIG_USART_BASE , +atmel_serial_setbrg_internal ((atmel_usart3_t *)CFG_USART_BASE ,CONFIG_USART_ID , gd->baudrate); }static int atmel_serial_init (void ) { -atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE ; +atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE ;atmel_serial_init_internal (usart);serial_setbrg ();
@@ -89,7 +89,7 @@ static int atmel_serial_init(void)static void atmel_serial_putc (char c) { -atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE ; +atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE ;if (c =='\n' )serial_putc ('\r' );
@@ -100,7 +100,7 @@ static void atmel_serial_putc(char c)static int atmel_serial_getc (void ) { -atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE ; +atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE ;while (!(readl (&usart->csr) &USART3_BIT (RXRDY )))schedule ();
@@ -109,7 +109,7 @@ static int atmel_serial_getc(void)static int atmel_serial_tstc (void ) { -atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE ; +atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE ;return (readl (&usart->csr) &USART3_BIT (RXRDY )) !=0 ; }
include/configs/corvus.h +1 -1
@@ -28,7 +28,7 @@#define CFG_SYS_AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ /* serial console */ -#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CFG_USART_BASE ATMEL_BASE_DBGU#define CONFIG_USART_ID ATMEL_ID_SYS/* SDRAM */
include/configs/sam9x60_curiosity.h +1 -1
@@ -13,7 +13,7 @@#define CFG_SYS_AT91_SLOW_CLOCK 32768#define CFG_SYS_AT91_MAIN_CLOCK 24000000/* 24 MHz crystal */ -#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CFG_USART_BASE ATMEL_BASE_DBGU#define CONFIG_USART_ID 0/* ignored in arm */ /* SDRAM */
include/configs/sam9x60ek.h +1 -1
@@ -14,7 +14,7 @@#define CFG_SYS_AT91_SLOW_CLOCK 32768#define CFG_SYS_AT91_MAIN_CLOCK 24000000/* 24 MHz crystal */ -#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CFG_USART_BASE ATMEL_BASE_DBGU#define CONFIG_USART_ID 0/* ignored in arm */ /*
include/configs/smartweb.h +1 -1
@@ -61,7 +61,7 @@#define CFG_SYS_NAND_READY_PIN AT91_PIN_PC13/* serial console */ -#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CFG_USART_BASE ATMEL_BASE_DBGU#define CONFIG_USART_ID ATMEL_ID_SYS/* DFU class support */
include/configs/taurus.h +1 -1
@@ -34,7 +34,7 @@/* Misc CPU related */ -#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CFG_USART_BASE ATMEL_BASE_DBGU#define CONFIG_USART_ID ATMEL_ID_SYS/*
include/configs/vinco.h +1 -1
@@ -17,7 +17,7 @@/* The value in the common file is too far away for the VInCo platform */ /* serial console */ -#define CONFIG_USART_BASE 0xfc00c000 +#define CFG_USART_BASE 0xfc00c000#define CONFIG_USART_ID 30/* Timer */
scripts/config_whitelist.txt +1 -1
@@ -238,7 +238,7 @@ CFG_UBOOTPATH CFG_UBOOT_SECTOR_COUNT CFG_UBOOT_SECTOR_START CFG_UEC_ETH -CONFIG_USART_BASE +CFG_USART_BASE CONFIG_USART_ID CONFIG_USBD_HS CONFIG_USB_BOOTING
Signature · 1 line
2.25.1
PATCH 225/241 global: Migrate CONFIG_USART_ID to CFG
In reply to Tom Rini--- drivers/serial/atmel_usart.c | 2 +- include/configs/corvus.h | 2 +- include/configs/sam9x60_curiosity.h | 2 +- include/configs/sam9x60ek.h | 2 +- include/configs/smartweb.h | 2 +- include/configs/taurus.h | 2 +- include/configs/vinco.h | 2 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)
drivers/serial/atmel_usart.c +1 -1
@@ -73,7 +73,7 @@ static void atmel_serial_activate(atmel_usart3_t *usart)static void atmel_serial_setbrg (void ) {atmel_serial_setbrg_internal ((atmel_usart3_t *)CFG_USART_BASE , -CONFIG_USART_ID , gd->baudrate); +CFG_USART_ID , gd->baudrate); }static int atmel_serial_init (void )
include/configs/corvus.h +1 -1
@@ -29,7 +29,7 @@/* serial console */ #define CFG_USART_BASE ATMEL_BASE_DBGU -#define CONFIG_USART_ID ATMEL_ID_SYS +#define CFG_USART_ID ATMEL_ID_SYS/* SDRAM */ #define CFG_SYS_SDRAM_BASE ATMEL_BASE_CS6
include/configs/sam9x60_curiosity.h +1 -1
@@ -14,7 +14,7 @@#define CFG_SYS_AT91_MAIN_CLOCK 24000000/* 24 MHz crystal */ #define CFG_USART_BASE ATMEL_BASE_DBGU -#define CONFIG_USART_ID 0/* ignored in arm */ +#define CFG_USART_ID 0/* ignored in arm */ /* SDRAM */ #define CFG_SYS_SDRAM_BASE 0x20000000
include/configs/sam9x60ek.h +1 -1
@@ -15,7 +15,7 @@#define CFG_SYS_AT91_MAIN_CLOCK 24000000/* 24 MHz crystal */ #define CFG_USART_BASE ATMEL_BASE_DBGU -#define CONFIG_USART_ID 0/* ignored in arm */ +#define CFG_USART_ID 0/* ignored in arm */ /* * define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0)
include/configs/smartweb.h +1 -1
@@ -62,7 +62,7 @@/* serial console */ #define CFG_USART_BASE ATMEL_BASE_DBGU -#define CONFIG_USART_ID ATMEL_ID_SYS +#define CFG_USART_ID ATMEL_ID_SYS/* DFU class support */ #define DFU_MANIFEST_POLL_TIMEOUT 25000
include/configs/taurus.h +1 -1
@@ -35,7 +35,7 @@/* Misc CPU related */ #define CFG_USART_BASE ATMEL_BASE_DBGU -#define CONFIG_USART_ID ATMEL_ID_SYS +#define CFG_USART_ID ATMEL_ID_SYS/* * SDRAM: 1 bank, min 32, max 128 MB
include/configs/vinco.h +1 -1
@@ -18,7 +18,7 @@/* serial console */ #define CFG_USART_BASE 0xfc00c000 -#define CONFIG_USART_ID 30 +#define CFG_USART_ID 30/* Timer */ #define CFG_SYS_TIMER_COUNTER 0xfc06863c
scripts/config_whitelist.txt +1 -1
@@ -239,7 +239,7 @@ CFG_UBOOT_SECTOR_COUNT CFG_UBOOT_SECTOR_START CFG_UEC_ETH CFG_USART_BASE -CONFIG_USART_ID +CFG_USART_ID CONFIG_USBD_HS CONFIG_USB_BOOTING CONFIG_USB_EXT2_BOOT
Signature · 1 line
2.25.1
PATCH 226/241 global: Migrate CONFIG_USBD_HS to CFG
In reply to Tom Rini--- README | 2 +- drivers/serial/usbtty.c | 12 ++++++------ drivers/serial/usbtty.h | 2 +- drivers/usb/gadget/ep0.c | 2 +- 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 | 2 +- include/configs/gw_ventana.h | 2 +- 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 | 2 +- include/configs/tbs2910.h | 2 +- include/configs/warp7.h | 2 +- include/usbdescriptors.h | 2 +- include/usbdevice.h | 8 ++++---- scripts/config_whitelist.txt | 2 +- 23 files changed, 31 insertions(+), 31 deletions(-)
README +1 -1
@@ -629,7 +629,7 @@ 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 + CFG_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)
drivers/serial/usbtty.c +6 -6
@@ -121,7 +121,7 @@ static struct usb_device_descriptor device_descriptor = { }; -#if defined(CONFIG_USBD_HS ) +#if defined(CFG_USBD_HS )static struct usb_qualifier_descriptor qualifier_descriptor = { .bLength =sizeof (struct usb_qualifier_descriptor ), .bDescriptorType = USB_DT_QUAL,
@@ -639,7 +639,7 @@ static void usbtty_init_instances (void)memset (device_instance,0 ,sizeof (struct usb_device_instance )); device_instance->device_state =STATE_INIT ; device_instance->device_descriptor = &device_descriptor; -#if defined(CONFIG_USBD_HS ) +#if defined(CFG_USBD_HS ) device_instance->qualifier_descriptor = &qualifier_descriptor;#endif device_instance->event = usbtty_event_handler;
@@ -755,7 +755,7 @@ static void usbtty_init_terminal_type(short type) device_descriptor.idProduct =cpu_to_le16 (CONFIG_USBD_PRODUCTID_CDCACM ); -#if defined(CONFIG_USBD_HS ) +#if defined(CFG_USBD_HS ) qualifier_descriptor.bDeviceClass =COMMUNICATIONS_DEVICE_CLASS ;#endif
@@ -787,7 +787,7 @@ static void usbtty_init_terminal_type(short type) device_descriptor.bDeviceClass =0xFF ; device_descriptor.idProduct =cpu_to_le16 (CONFIG_USBD_PRODUCTID_GSERIAL ); -#if defined(CONFIG_USBD_HS ) +#if defined(CFG_USBD_HS ) qualifier_descriptor.bDeviceClass =0xFF ;#endif /* Assign endpoint indices */
@@ -937,7 +937,7 @@ static int usbtty_configured (void)static void usbtty_event_handler (struct usb_device_instance *device,usb_device_event_t event,int data) { -#if defined(CONFIG_USBD_HS ) +#if defined(CFG_USBD_HS )int i;#endif switch (event) {
@@ -950,7 +950,7 @@ static void usbtty_event_handler (struct usb_device_instance *device,break ;case DEVICE_ADDRESS_ASSIGNED : -#if defined(CONFIG_USBD_HS ) +#if defined(CFG_USBD_HS )/* * is_usbd_high_speed routine needs to be defined by * specific gadget driver
drivers/serial/usbtty.h +1 -1
@@ -51,7 +51,7 @@#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 ) +#if defined(CFG_USBD_HS )#define CONFIG_USBD_SERIAL_BULK_HS_PKTSIZE UDC_BULK_HS_PACKET_SIZE#endif
drivers/usb/gadget/ep0.c +1 -1
@@ -371,7 +371,7 @@ static int ep0_get_descriptor (struct usb_device_instance *device, }break ;case USB_DESCRIPTOR_TYPE_DEVICE_QUALIFIER : -#if defined(CONFIG_USBD_HS ) +#if defined(CFG_USBD_HS ) {struct usb_qualifier_descriptor *qualifier_descriptor = device->qualifier_descriptor;
include/configs/apalis_imx6.h +1 -1
@@ -29,7 +29,7 @@#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CFG_MXC_USB_FLAGS 0/* Client */ -#define CONFIG_USBD_HS +#define CFG_USBD_HS /* Framebuffer and LCD */
include/configs/colibri-imx6ull.h +1 -1
@@ -130,7 +130,7 @@#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CFG_MXC_USB_FLAGS 0 -#define CONFIG_USBD_HS +#define CFG_USBD_HS /* USB Device Firmware Update support */ #define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/colibri_imx6.h +1 -1
@@ -26,7 +26,7 @@#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CFG_MXC_USB_FLAGS 0/* Client */ -#define CONFIG_USBD_HS +#define CFG_USBD_HS /* Command definition */
include/configs/colibri_imx7.h +1 -1
@@ -174,6 +174,6 @@#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CFG_MXC_USB_FLAGS 0 -#define CONFIG_USBD_HS +#define CFG_USBD_HS #endif
include/configs/ge_b1x5v2.h +1 -1
@@ -26,7 +26,7 @@/* USB */ #define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CFG_MXC_USB_FLAGS 0 -#define CONFIG_USBD_HS +#define CFG_USBD_HS /* Memory */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
include/configs/gw_ventana.h +1 -1
@@ -38,7 +38,7 @@/* USB Configs */ #define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CFG_MXC_USB_FLAGS 0 -#define CONFIG_USBD_HS +#define CFG_USBD_HS /* Miscellaneous configurable options */
include/configs/imx7-cm.h +1 -1
@@ -81,6 +81,6 @@/* USB Configs */ #define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_USBD_HS +#define CFG_USBD_HS #endif /* __CONFIG_H */
include/configs/librem5.h +1 -1
@@ -27,7 +27,7 @@#define CFG_SYS_FSL_USDHC_NUM 2 -#define CONFIG_USBD_HS +#define CFG_USBD_HS #define CONSOLE_ON_UART1
include/configs/mx6sabre_common.h +1 -1
@@ -145,6 +145,6 @@/* Environment organization */ -#define CONFIG_USBD_HS +#define CFG_USBD_HS #endif /* __MX6QSABRE_COMMON_CONFIG_H */
include/configs/mx7dsabresd.h +1 -1
@@ -101,6 +101,6 @@/* USB Configs */ #define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_USBD_HS +#define CFG_USBD_HS #endif /* __CONFIG_H */
include/configs/nitrogen6x.h +1 -1
@@ -11,7 +11,7 @@#include "mx6_common.h" -#define CONFIG_USBD_HS +#define CFG_USBD_HS #define CFG_MXC_UART_BASE UART2_BASE
include/configs/novena.h +1 -1
@@ -60,7 +60,7 @@#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CFG_MXC_USB_FLAGS 0/* Gadget part */ -#define CONFIG_USBD_HS +#define CFG_USBD_HS #endif /* Extra U-Boot environment. */
include/configs/pico-imx6ul.h +1 -1
@@ -26,7 +26,7 @@#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CFG_MXC_USB_FLAGS 0 -#define CONFIG_USBD_HS +#define CFG_USBD_HS #define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/siemens-am33x-common.h +1 -1
@@ -73,7 +73,7 @@*/ /* USB DRACO ID as default */ -#define CONFIG_USBD_HS +#define CFG_USBD_HS /* USB Device Firmware Update support */ #define DFU_MANIFEST_POLL_TIMEOUT 25000
include/configs/tbs2910.h +1 -1
@@ -29,7 +29,7 @@#ifdef CONFIG_CMD_USB #define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#ifdef CONFIG_CMD_USB_MASS_STORAGE -#define CONFIG_USBD_HS +#define CFG_USBD_HS #endif /* CONFIG_CMD_USB_MASS_STORAGE */ #endif /* CONFIG_CMD_USB */
include/configs/warp7.h +1 -1
@@ -95,7 +95,7 @@#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_USBD_HS +#define CFG_USBD_HS /* USB Device Firmware Update support */ #define DFU_DEFAULT_POLL_TIMEOUT 300
include/usbdescriptors.h +1 -1
@@ -227,7 +227,7 @@ struct usb_device_descriptor {u8 bNumConfigurations; } __attribute__ ((packed)); -#if defined(CONFIG_USBD_HS) +#if defined(CFG_USBD_HS) struct usb_qualifier_descriptor { u8 bLength; u8 bDescriptorType;
include/usbdevice.h +4 -4
@@ -196,7 +196,7 @@ struct usb_bus_instance;#define USB_DT_INTERFACE 0x04#define USB_DT_ENDPOINT 0x05 -#if defined(CONFIG_USBD_HS ) +#if defined(CFG_USBD_HS )#define USB_DT_QUAL 0x06#endif
@@ -279,7 +279,7 @@ struct usb_bus_instance;* USB Spec Release number */ -#if defined(CONFIG_USBD_HS ) +#if defined(CFG_USBD_HS )#define USB_BCD_VERSION 0x0200#else #define USB_BCD_VERSION 0x0110
@@ -552,7 +552,7 @@ struct usb_device_instance {/* generic */ char *name;struct usb_device_descriptor *device_descriptor;/* per device descriptor */ -#if defined(CONFIG_USBD_HS ) +#if defined(CFG_USBD_HS )struct usb_qualifier_descriptor *qualifier_descriptor;#endif
@@ -644,7 +644,7 @@ 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 ) +#if defined(CFG_USBD_HS )/* * is_usbd_high_speed routine needs to be defined by specific gadget driver * It returns true if device enumerates at High speed
scripts/config_whitelist.txt +1 -1
@@ -240,7 +240,7 @@ CFG_UBOOT_SECTOR_START CFG_UEC_ETH CFG_USART_BASE CFG_USART_ID -CONFIG_USBD_HS +CFG_USBD_HS CONFIG_USB_BOOTING CONFIG_USB_EXT2_BOOT CONFIG_USB_FAT_BOOT
Signature · 1 line
2.25.1
PATCH 227/241 global: Migrate CONFIG_USB_BOOTING to CFG
In reply to Tom Rini--- arch/arm/mach-exynos/spl_boot.c | 6 +++--- include/configs/exynos5-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-exynos/spl_boot.c +3 -3
@@ -78,7 +78,7 @@ void *get_irom_func(int index)return (void *)*(u32 *)irom_ptr_table[index]; } -#ifdef CONFIG_USB_BOOTING +#ifdef CFG_USB_BOOTING /* * Set/clear program flow prediction and return the previous state. */
@@ -227,7 +227,7 @@ void copy_uboot_to_ram(void)u32 (*copy_bl2_from_emmc)(u32 nblock,u32 dst);void (*end_bootop_from_emmc)(void );#endif -#ifdef CONFIG_USB_BOOTING +#ifdef CFG_USB_BOOTING int is_cr_z_set;unsigned int sec_boot_check;
@@ -271,7 +271,7 @@ void copy_uboot_to_ram(void)end_bootop_from_emmc ();break ;#endif -#ifdef CONFIG_USB_BOOTING +#ifdef CFG_USB_BOOTING case BOOT_MODE_USB :/* * iROM needs program flow prediction to be disabled
include/configs/exynos5-common.h +1 -1
@@ -58,7 +58,7 @@/* USB */ /* USB boot mode */ -#define CONFIG_USB_BOOTING +#define CFG_USB_BOOTING #define EXYNOS_COPY_USB_FNPTR_ADDR 0x02020070#define EXYNOS_USB_SECONDARY_BOOT 0xfeed0002#define EXYNOS_IRAM_SECONDARY_BASE 0x02020018
scripts/config_whitelist.txt +1 -1
@@ -241,7 +241,7 @@ CFG_UEC_ETH CFG_USART_BASE CFG_USART_ID CFG_USBD_HS -CONFIG_USB_BOOTING +CFG_USB_BOOTING CONFIG_USB_EXT2_BOOT CONFIG_USB_FAT_BOOT CONFIG_USB_ISP1301_I2C_ADDR
Signature · 1 line
2.25.1
PATCH 228/241 global: Migrate CONFIG_USB_EXT2_BOOT to CFG
In reply to Tom Rini--- include/configs/p1_p2_rdb_pc.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/p1_p2_rdb_pc.h +1 -1
@@ -472,7 +472,7 @@ RST_DEF_CMD(defboot) \"fatload usb 0:2 $ramdiskaddr $ramdiskfile;" \"bootm $loadaddr $ramdiskaddr $fdtaddr" -#define CONFIG_USB_EXT2_BOOT \ +#define CFG_USB_EXT2_BOOT \"setenv bootargs root=/dev/ram rw " \"console=$consoledev,$baudrate $othbootargs " \"ramdisk_size=$ramdisk_size;" \
scripts/config_whitelist.txt +1 -1
@@ -242,7 +242,7 @@ CFG_USART_BASE CFG_USART_ID CFG_USBD_HS CFG_USB_BOOTING -CONFIG_USB_EXT2_BOOT +CFG_USB_EXT2_BOOT CONFIG_USB_FAT_BOOT CONFIG_USB_ISP1301_I2C_ADDR CONFIG_U_BOOT_HDR_SIZE
Signature · 1 line
2.25.1
PATCH 229/241 global: Migrate CONFIG_USB_FAT_BOOT to CFG
In reply to Tom Rini--- include/configs/p1_p2_rdb_pc.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/p1_p2_rdb_pc.h +1 -1
@@ -462,7 +462,7 @@ RST_PCIE_CMD(pciboot) \ RST_DEF_CMD(defboot) \"" -#define CONFIG_USB_FAT_BOOT \ +#define CFG_USB_FAT_BOOT \"setenv bootargs root=/dev/ram rw " \"console=$consoledev,$baudrate $othbootargs " \"ramdisk_size=$ramdisk_size;" \
scripts/config_whitelist.txt +1 -1
@@ -243,7 +243,7 @@ CFG_USART_ID CFG_USBD_HS CFG_USB_BOOTING CFG_USB_EXT2_BOOT -CONFIG_USB_FAT_BOOT +CFG_USB_FAT_BOOT CONFIG_USB_ISP1301_I2C_ADDR CONFIG_U_BOOT_HDR_SIZE CONFIG_VAR_SIZE_SPL
Signature · 1 line
2.25.1
PATCH 230/241 global: Migrate CONFIG_USB_ISP1301_I2C_ADDR to CFG
In reply to Tom Rini--- drivers/usb/host/ohci-lpc32xx.c | 2 +- include/configs/devkit3250.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/usb/host/ohci-lpc32xx.c +1 -1
@@ -69,7 +69,7 @@ struct otg_regs {#define OTG1_DM_PULLDOWN (1 << 3)#define OTG1_VBUS_DRV (1 << 5) -#define ISP1301_I2C_ADDR CONFIG_USB_ISP1301_I2C_ADDR +#define ISP1301_I2C_ADDR CFG_USB_ISP1301_I2C_ADDR#define ISP1301_I2C_MODE_CONTROL_1_SET 0x04#define ISP1301_I2C_MODE_CONTROL_1_CLR 0x05
include/configs/devkit3250.h +1 -1
@@ -53,7 +53,7 @@/* * USB */ -#define CONFIG_USB_ISP1301_I2C_ADDR 0x2d +#define CFG_USB_ISP1301_I2C_ADDR 0x2d/* * U-Boot General Configurations
scripts/config_whitelist.txt +1 -1
@@ -244,7 +244,7 @@ CFG_USBD_HS CFG_USB_BOOTING CFG_USB_EXT2_BOOT CFG_USB_FAT_BOOT -CONFIG_USB_ISP1301_I2C_ADDR +CFG_USB_ISP1301_I2C_ADDR CONFIG_U_BOOT_HDR_SIZE CONFIG_VAR_SIZE_SPL CONFIG_VERY_BIG_RAM
Signature · 1 line
2.25.1
PATCH 231/241 global: Migrate CONFIG_U_BOOT_HDR_SIZE to CFG
In reply to Tom Rini--- board/freescale/common/fsl_chain_of_trust.c | 2 +- drivers/mtd/nand/raw/fsl_ifc_spl.c | 2 +- include/configs/T104xRDB.h | 4 ++-- include/configs/ls1021atsn.h | 6 +++--- include/configs/ls1021atwr.h | 6 +++--- include/configs/ls1043a_common.h | 8 ++++---- include/configs/ls1046a_common.h | 2 +- include/configs/ls1088a_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 9 files changed, 17 insertions(+), 17 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 ); +CFG_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 +1 -1
@@ -281,7 +281,7 @@ void nand_boot(void)#define CONFIG_U_BOOT_HDR_ADDR \ ((CFG_SYS_NAND_U_BOOT_START + \ CFG_SYS_NAND_U_BOOT_SIZE) - \ - CONFIG_U_BOOT_HDR_SIZE) + CFG_U_BOOT_HDR_SIZE)spl_validate_uboot (CONFIG_U_BOOT_HDR_ADDR ,CFG_SYS_NAND_U_BOOT_START );/*
include/configs/T104xRDB.h +2 -2
@@ -20,13 +20,13 @@#ifdef CONFIG_MTD_RAW_NAND #ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_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) + CFG_U_BOOT_HDR_SIZE)#else #define CFG_SYS_NAND_U_BOOT_SIZE (768 << 10)#endif
include/configs/ls1021atsn.h +3 -3
@@ -40,17 +40,17 @@#ifdef CONFIG_SD_BOOT #ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_U_BOOT_HDR_SIZE (16 << 10)#endif /* ifdef CONFIG_NXP_ESBC */ -#ifdef CONFIG_U_BOOT_HDR_SIZE +#ifdef CFG_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 /* ifdef CFG_U_BOOT_HDR_SIZE */ #endif #define PHYS_SDRAM 0x80000000
include/configs/ls1021atwr.h +3 -3
@@ -43,17 +43,17 @@* 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) +#define CFG_U_BOOT_HDR_SIZE (16 << 10)#endif /* ifdef CONFIG_NXP_ESBC */ -#ifdef CONFIG_U_BOOT_HDR_SIZE +#ifdef CFG_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 /* ifdef CFG_U_BOOT_HDR_SIZE */ #endif #define PHYS_SDRAM 0x80000000
include/configs/ls1043a_common.h +4 -4
@@ -45,7 +45,7 @@/* SD boot SPL */ #ifdef CONFIG_SD_BOOT #ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_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
@@ -61,17 +61,17 @@#define CFG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE#ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_U_BOOT_HDR_SIZE (16 << 10)#endif /* ifdef CONFIG_NXP_ESBC */ -#ifdef CONFIG_U_BOOT_HDR_SIZE +#ifdef CFG_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 /* ifdef CFG_U_BOOT_HDR_SIZE */ #endif
include/configs/ls1046a_common.h +1 -1
@@ -45,7 +45,7 @@/* SD boot SPL */ #ifdef CONFIG_SD_BOOT #ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_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
include/configs/ls1088a_common.h +1 -1
@@ -136,7 +136,7 @@ unsigned long long get_qixis_addr(void);#ifdef CONFIG_SPL #ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_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
scripts/config_whitelist.txt +1 -1
@@ -245,7 +245,7 @@ CFG_USB_BOOTING CFG_USB_EXT2_BOOT CFG_USB_FAT_BOOT CFG_USB_ISP1301_I2C_ADDR -CONFIG_U_BOOT_HDR_SIZE +CFG_U_BOOT_HDR_SIZE CONFIG_VAR_SIZE_SPL CONFIG_VERY_BIG_RAM CONFIG_VSC7385_IMAGE
Signature · 1 line
2.25.1
PATCH 232/241 global: Migrate CONFIG_VAR_SIZE_SPL to CFG
In reply to Tom Rini--- include/configs/exynos5420-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/exynos5420-common.h +1 -1
@@ -8,7 +8,7 @@#ifndef __CONFIG_EXYNOS5420_H#define __CONFIG_EXYNOS5420_H -#define CONFIG_VAR_SIZE_SPL +#define CFG_VAR_SIZE_SPL #define CFG_IRAM_TOP 0x02074000
scripts/config_whitelist.txt +1 -1
@@ -246,7 +246,7 @@ CFG_USB_EXT2_BOOT CFG_USB_FAT_BOOT CFG_USB_ISP1301_I2C_ADDR CFG_U_BOOT_HDR_SIZE -CONFIG_VAR_SIZE_SPL +CFG_VAR_SIZE_SPL CONFIG_VERY_BIG_RAM CONFIG_VSC7385_IMAGE CONFIG_VSC7385_IMAGE_SIZE
Signature · 1 line
2.25.1
PATCH 233/241 global: Migrate CONFIG_VERY_BIG_RAM to CFG
In reply to Tom Rini--- arch/arm/include/asm/arch-ls102xa/config.h | 2 +- arch/xtensa/include/asm/config.h | 2 +- drivers/ram/mpc83xx_sdram.c | 2 +- include/configs/P2041RDB.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/kmcent2.h | 2 +- include/configs/kontron_sl28.h | 2 +- include/configs/ls1028a_common.h | 2 +- include/configs/ls1043a_common.h | 2 +- include/configs/ls1046a_common.h | 2 +- include/configs/ls1088a_common.h | 2 +- include/configs/ls2080a_common.h | 2 +- include/configs/lx2160a_common.h | 2 +- include/configs/mt7621.h | 2 +- include/configs/qemu-ppce500.h | 2 +- include/configs/rcar-gen3-common.h | 2 +- include/configs/socrates.h | 2 +- include/configs/synquacer.h | 2 +- scripts/config_whitelist.txt | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-)
arch/arm/include/asm/arch-ls102xa/config.h +1 -1
@@ -75,7 +75,7 @@/* SATA */ #define AHCI_BASE_ADDR (CONFIG_SYS_IMMR + 0x02200000)#ifdef CONFIG_DDR_SPD -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED ((phys_size_t)2 << 30)#endif
arch/xtensa/include/asm/config.h +1 -1
@@ -14,7 +14,7 @@* restricting used physical memory to the first 128MB. */ #if XCHAL_HAVE_PTP_MMU -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED (128 << 20)#endif
drivers/ram/mpc83xx_sdram.c +1 -1
@@ -118,7 +118,7 @@ int dram_init(void)phys_size_t get_effective_memsize (void ) { -if (!IS_ENABLED (CONFIG_VERY_BIG_RAM )) +if (!IS_ENABLED (CFG_VERY_BIG_RAM ))return gd->ram_size;/* Limit stack to what we can reasonable map */
include/configs/P2041RDB.h +1 -1
@@ -62,7 +62,7 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/T102xRDB.h +1 -1
@@ -112,7 +112,7 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_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 )
include/configs/T104xRDB.h +1 -1
@@ -86,7 +86,7 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/T208xQDS.h +1 -1
@@ -78,7 +78,7 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_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 */
include/configs/T208xRDB.h +1 -1
@@ -78,7 +78,7 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_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 */
include/configs/T4240RDB.h +1 -1
@@ -60,7 +60,7 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
include/configs/dra7xx_evm.h +1 -1
@@ -13,7 +13,7 @@#include <environment/ti/dfu.h> -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED 0x80000000#ifndef CONFIG_QSPI_BOOT
include/configs/kmcent2.h +1 -1
@@ -161,7 +161,7 @@/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_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 +1 -1
@@ -18,7 +18,7 @@/* DDR */ #define CFG_MEM_INIT_VALUE 0xdeadbeef -#define CONFIG_VERY_BIG_RAM +#define CFG_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/ls1028a_common.h +1 -1
@@ -12,7 +12,7 @@/* Link Definitions */ -#define CONFIG_VERY_BIG_RAM +#define CFG_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 +1 -1
@@ -31,7 +31,7 @@/* Link Definitions */ -#define CONFIG_VERY_BIG_RAM +#define CFG_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/ls1046a_common.h +1 -1
@@ -31,7 +31,7 @@/* Link Definitions */ -#define CONFIG_VERY_BIG_RAM +#define CFG_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/ls1088a_common.h +1 -1
@@ -29,7 +29,7 @@/* Link Definitions */ #define CFG_SYS_FSL_QSPI_BASE 0x20000000 -#define CONFIG_VERY_BIG_RAM +#define CFG_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/ls2080a_common.h +1 -1
@@ -16,7 +16,7 @@/* Link Definitions */ -#define CONFIG_VERY_BIG_RAM +#define CFG_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/lx2160a_common.h +1 -1
@@ -13,7 +13,7 @@#define CFG_SYS_FLASH_BASE 0x20000000/* DDR */ -#define CONFIG_VERY_BIG_RAM +#define CFG_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/mt7621.h +1 -1
@@ -10,7 +10,7 @@#define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED 0x1c000000#define CFG_SYS_INIT_SP_OFFSET 0x800000
include/configs/qemu-ppce500.h +1 -1
@@ -29,7 +29,7 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);/* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_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 +1 -1
@@ -28,7 +28,7 @@#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 CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE)/* ENV setting */
include/configs/socrates.h +1 -1
@@ -55,7 +55,7 @@#define CFG_SYS_DDR_SDRAM_BASE 0x00000000#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM /* I2C addresses of SPD EEPROMs */ #define SPD_EEPROM_ADDRESS 0x50/* CTLR 0 DIMM 0 */
include/configs/synquacer.h +1 -1
@@ -14,7 +14,7 @@#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 CFG_VERY_BIG_RAM /* SynQuacer supports up to 64GB */ #define CFG_MAX_MEM_MAPPED PHYS_SDRAM_SIZE#define SQ_DRAMINFO_BASE (0x2e00ffc0)/* DRAM info from TF-A */
scripts/config_whitelist.txt +1 -1
@@ -247,7 +247,7 @@ CFG_USB_FAT_BOOT CFG_USB_ISP1301_I2C_ADDR CFG_U_BOOT_HDR_SIZE CFG_VAR_SIZE_SPL -CONFIG_VERY_BIG_RAM +CFG_VERY_BIG_RAM CONFIG_VSC7385_IMAGE CONFIG_VSC7385_IMAGE_SIZE CONFIG_WATCHDOG_PRESC
Signature · 1 line
2.25.1
PATCH 234/241 global: Migrate CONFIG_VSC7385_IMAGE to CFG
In reply to Tom Rini--- board/freescale/mpc837xerdb/mpc837xerdb.c | 6 +++--- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- include/configs/MPC837XERDB.h | 4 ++-- include/configs/p1_p2_rdb_pc.h | 2 +- scripts/config_whitelist.txt | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
board/freescale/mpc837xerdb/mpc837xerdb.c +3 -3
@@ -206,9 +206,9 @@ int misc_init_r(void) {int rc =0 ; -#ifdef CONFIG_VSC7385_IMAGE -if (vsc7385_upload_firmware ((void *)CONFIG_VSC7385_IMAGE , -CONFIG_VSC7385_IMAGE_SIZE )) { +#ifdef CFG_VSC7385_IMAGE +if (vsc7385_upload_firmware ((void *)CFG_VSC7385_IMAGE , +CFG_VSC7385_IMAGE_SIZE )) {puts ("Failure uploading VSC7385 microcode.\n" ); rc =1 ; }
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +1 -1
@@ -355,7 +355,7 @@ int board_early_init_r(void) vscfw_addr =hextoul (tmp,NULL );printf ("uploading VSC7385 microcode from %x\n" , vscfw_addr);if (vsc7385_upload_firmware ((void *)vscfw_addr, -CONFIG_VSC7385_IMAGE_SIZE )) +CFG_VSC7385_IMAGE_SIZE ))puts ("Failure uploading VSC7385 microcode.\n" ); }else {puts ("No address specified for VSC7385 microcode.\n" );
include/configs/MPC837XERDB.h +2 -2
@@ -44,8 +44,8 @@#define CFG_TSEC2 /* The flash address and size of the VSC7385 firmware image */ -#define CONFIG_VSC7385_IMAGE 0xFE7FE000 -#define CONFIG_VSC7385_IMAGE_SIZE 8192 +#define CFG_VSC7385_IMAGE 0xFE7FE000 +#define CFG_VSC7385_IMAGE_SIZE 8192#endif
include/configs/p1_p2_rdb_pc.h +1 -1
@@ -276,7 +276,7 @@#endif /* The size of the VSC7385 firmware image */ -#define CONFIG_VSC7385_IMAGE_SIZE 8192 +#define CFG_VSC7385_IMAGE_SIZE 8192#endif #ifndef __VSCFW_ADDR
scripts/config_whitelist.txt +2 -2
@@ -248,8 +248,8 @@ CFG_USB_ISP1301_I2C_ADDR CFG_U_BOOT_HDR_SIZE CFG_VAR_SIZE_SPL CFG_VERY_BIG_RAM -CONFIG_VSC7385_IMAGE -CONFIG_VSC7385_IMAGE_SIZE +CFG_VSC7385_IMAGE +CFG_VSC7385_IMAGE_SIZE CONFIG_WATCHDOG_PRESC CONFIG_WATCHDOG_RC CONFIG_WATCHDOG_TIMEOUT
Signature · 1 line
2.25.1
PATCH 235/241 global: Migrate CONFIG_WATCHDOG_PRESC to CFG
In reply to Tom Rini--- arch/powerpc/cpu/mpc85xx/cpu.c | 2 +- include/configs/kmcent2.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/cpu/mpc85xx/cpu.c +1 -1
@@ -357,7 +357,7 @@ voidinit_85xx_watchdog (void) {mtspr (SPRN_TCR , (mfspr (SPRN_TCR ) & ~WATCHDOG_MASK ) | -TCR_WP (CONFIG_WATCHDOG_PRESC ) |TCR_WRC (CONFIG_WATCHDOG_RC )); +TCR_WP (CFG_WATCHDOG_PRESC ) |TCR_WRC (CONFIG_WATCHDOG_RC )); }void
include/configs/kmcent2.h +1 -1
@@ -377,7 +377,7 @@ int get_scl(void);/* * Hardware Watchdog */ -#define CONFIG_WATCHDOG_PRESC 34/* wdog prescaler 2^(64-34) ~10min */ +#define CFG_WATCHDOG_PRESC 34/* wdog prescaler 2^(64-34) ~10min */ #define CONFIG_WATCHDOG_RC WRC_CHIP/* reset chip on watchdog event */ /*
scripts/config_whitelist.txt +1 -1
@@ -250,7 +250,7 @@ CFG_VAR_SIZE_SPL CFG_VERY_BIG_RAM CFG_VSC7385_IMAGE CFG_VSC7385_IMAGE_SIZE -CONFIG_WATCHDOG_PRESC +CFG_WATCHDOG_PRESC CONFIG_WATCHDOG_RC CONFIG_WATCHDOG_TIMEOUT CONFIG_X86EMU_RAW_IO
Signature · 1 line
2.25.1
PATCH 236/241 global: Migrate CONFIG_WATCHDOG_RC to CFG
In reply to Tom Rini--- arch/powerpc/cpu/mpc85xx/cpu.c | 2 +- include/configs/kmcent2.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/cpu/mpc85xx/cpu.c +1 -1
@@ -357,7 +357,7 @@ voidinit_85xx_watchdog (void) {mtspr (SPRN_TCR , (mfspr (SPRN_TCR ) & ~WATCHDOG_MASK ) | -TCR_WP (CFG_WATCHDOG_PRESC ) |TCR_WRC (CONFIG_WATCHDOG_RC )); +TCR_WP (CFG_WATCHDOG_PRESC ) |TCR_WRC (CFG_WATCHDOG_RC )); }void
include/configs/kmcent2.h +1 -1
@@ -378,7 +378,7 @@ int get_scl(void);* Hardware Watchdog */ #define CFG_WATCHDOG_PRESC 34/* wdog prescaler 2^(64-34) ~10min */ -#define CONFIG_WATCHDOG_RC WRC_CHIP/* reset chip on watchdog event */ +#define CFG_WATCHDOG_RC WRC_CHIP/* reset chip on watchdog event */ /* * For booting Linux, the board info and command line data
scripts/config_whitelist.txt +1 -1
@@ -251,7 +251,7 @@ CFG_VERY_BIG_RAM CFG_VSC7385_IMAGE CFG_VSC7385_IMAGE_SIZE CFG_WATCHDOG_PRESC -CONFIG_WATCHDOG_RC +CFG_WATCHDOG_RC CONFIG_WATCHDOG_TIMEOUT CONFIG_X86EMU_RAW_IO CONFIG_X86_MRC_ADDR
Signature · 1 line
2.25.1
PATCH 237/241 global: Migrate CONFIG_X86EMU_RAW_IO to CFG
In reply to Tom Rini--- drivers/bios_emulator/besys.c | 18 +++++++++--------- include/configs/conga-qeval20-qa3-e3845.h | 2 +- include/configs/dfi-bt700.h | 2 +- include/configs/minnowmax.h | 2 +- include/configs/som-db5800-som-6867.h | 2 +- include/configs/theadorable-x86-common.h | 2 +- include/configs/x86-chromebook.h | 2 +- scripts/config_whitelist.txt | 2 -- 8 files changed, 15 insertions(+), 17 deletions(-)
drivers/bios_emulator/besys.c +9 -9
@@ -54,7 +54,7 @@/*------------------------- Global Variables ------------------------------*/ -#ifndef CONFIG_X86EMU_RAW_IO +#ifndef CFG_X86EMU_RAW_IO static char *BE_biosDate ="08/14/99" ;static u8 BE_model =0xFC ;static u8 BE_submodel =0x00 ;
@@ -94,7 +94,7 @@ static u8 *BE_memaddr(u32 addr) } else if (addr >= 0xA0000 && addr <= 0xBFFFF) {return (u8 *)(_BE_env.busmem_base + addr -0xA0000 ); } -#ifdef CONFIG_X86EMU_RAW_IO +#ifdef CFG_X86EMU_RAW_IO else if (addr >= 0xD0000 && addr <= 0xFFFFF) {/* We map the real System BIOS directly on real PC's */ DB(printf("BE_memaddr: System BIOS address %#lx\n",
@@ -240,7 +240,7 @@ void X86API BE_wrl(u32 addr, u32 val) } } -#if !defined(CONFIG_X86EMU_RAW_IO ) +#if !defined(CFG_X86EMU_RAW_IO )/* For Non-Intel machines we may need to emulate some I/O port accesses that * the BIOS may try to access, such as the PCI config registers.
@@ -571,7 +571,7 @@ u8 X86API BE_inb(X86EMU_pioAddr port) {u8 val =0 ; -#if !defined(CONFIG_X86EMU_RAW_IO ) +#if !defined(CFG_X86EMU_RAW_IO )if (IS_VGA_PORT (port)){/*seems reading port 0x3c3 return the high 16 bit of io port*/ if (port ==0x3c3 )
@@ -617,7 +617,7 @@ u16 X86API BE_inw(X86EMU_pioAddr port) {u16 val =0 ; -#if !defined(CONFIG_X86EMU_RAW_IO ) +#if !defined(CFG_X86EMU_RAW_IO )if (IS_PCI_PORT (port)) val =PCI_inp (port,REG_READ_WORD );else if (port <0x100 ) {
@@ -650,7 +650,7 @@ u32 X86API BE_inl(X86EMU_pioAddr port) {u32 val =0 ; -#if !defined(CONFIG_X86EMU_RAW_IO ) +#if !defined(CFG_X86EMU_RAW_IO )if (IS_PCI_PORT (port)) val =PCI_inp (port,REG_READ_DWORD );else if (port <0x100 ) {
@@ -678,7 +678,7 @@ through to the real hardware if we don't need to special case it.****************************************************************************/ void X86API BE_outb(X86EMU_pioAddr port, u8 val) { -#if !defined(CONFIG_X86EMU_RAW_IO ) +#if !defined(CFG_X86EMU_RAW_IO )if (IS_VGA_PORT (port))VGA_outpb (port, val);else if (IS_TIMER_PORT (port))
@@ -713,7 +713,7 @@ through to the real hardware if we don't need to special case it.****************************************************************************/ void X86API BE_outw(X86EMU_pioAddr port, u16 val) { -#if !defined(CONFIG_X86EMU_RAW_IO ) +#if !defined(CFG_X86EMU_RAW_IO )if (IS_VGA_PORT (port)) {VGA_outpb (port, val);VGA_outpb (port +1 , val >>8 );
@@ -744,7 +744,7 @@ through to the real hardware if we don't need to special case it.****************************************************************************/ void X86API BE_outl(X86EMU_pioAddr port, u32 val) { -#if !defined(CONFIG_X86EMU_RAW_IO ) +#if !defined(CFG_X86EMU_RAW_IO )if (IS_PCI_PORT (port)) {PCI_outp (port, val,REG_WRITE_DWORD ); }else if (port <0x100 ) {
include/configs/conga-qeval20-qa3-e3845.h +1 -1
@@ -17,7 +17,7 @@ "stderr=serial\0"#define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO +#define CFG_X86EMU_RAW_IO #undef CFG_EXTRA_ENV_SETTINGS#define CFG_EXTRA_ENV_SETTINGS \
include/configs/dfi-bt700.h +1 -1
@@ -21,7 +21,7 @@ "stderr=serial\0"#define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO +#define CFG_X86EMU_RAW_IO #undef CFG_EXTRA_ENV_SETTINGS#define CFG_EXTRA_ENV_SETTINGS \
include/configs/minnowmax.h +1 -1
@@ -18,6 +18,6 @@ "usb_pgood_delay=40\0"#define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO +#define CFG_X86EMU_RAW_IO #endif /* __CONFIG_H */
include/configs/som-db5800-som-6867.h +1 -1
@@ -17,6 +17,6 @@ "stderr=serial,vidconsole\0"#define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO +#define CFG_X86EMU_RAW_IO #endif /* __CONFIG_H */
include/configs/theadorable-x86-common.h +1 -1
@@ -16,7 +16,7 @@ "stderr=serial\0"#define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO +#define CFG_X86EMU_RAW_IO /* Environment settings */
include/configs/x86-chromebook.h +1 -1
@@ -11,7 +11,7 @@#define CONFIG_X86_REFCODE_RUN_ADDR 0#define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO +#define CFG_X86EMU_RAW_IO #define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ "stdout=vidconsole,serial\0" \
scripts/config_whitelist.txt +0 -2
@@ -252,8 +252,6 @@ CFG_VSC7385_IMAGE CFG_VSC7385_IMAGE_SIZE CFG_WATCHDOG_PRESC CFG_WATCHDOG_RC -CONFIG_WATCHDOG_TIMEOUT -CONFIG_X86EMU_RAW_IO CONFIG_X86_MRC_ADDR CONFIG_X86_REFCODE_ADDR CONFIG_X86_REFCODE_RUN_ADDR
Signature · 1 line
2.25.1
PATCH 238/241 global: Migrate CONFIG_X86_MRC_ADDR to CFG
In reply to Tom Rini--- arch/x86/cpu/intel_common/mrc.c | 2 +- arch/x86/dts/u-boot.dtsi | 2 +- include/configs/x86-chromebook.h | 2 +- scripts/config_whitelist.txt | 3 ++- tools/binman/binman.rst | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-)
arch/x86/cpu/intel_common/mrc.c +1 -1
@@ -200,7 +200,7 @@ static int sdram_initialise(struct udevice *dev, struct udevice *me_dev,debug ("PEI data at %p:\n" , pei_data); - data = (char *)CONFIG_X86_MRC_ADDR ; + data = (char *)CFG_X86_MRC_ADDR ;if (data) {int rv;ulong start;
arch/x86/dts/u-boot.dtsi +1 -1
@@ -86,7 +86,7 @@ #endif #ifdef CONFIG_HAVE_MRC intel-mrc { - offset = <CONFIG_X86_MRC_ADDR>; + offset = <CFG_X86_MRC_ADDR>; }; #endif #ifdef CONFIG_FSP_VERSION1
include/configs/x86-chromebook.h +1 -1
@@ -6,7 +6,7 @@#ifndef _X86_CHROMEBOOK_H#define _X86_CHROMEBOOK_H -#define CONFIG_X86_MRC_ADDR 0xfffa0000 +#define CFG_X86_MRC_ADDR 0xfffa0000#define CONFIG_X86_REFCODE_ADDR 0xffea0000#define CONFIG_X86_REFCODE_RUN_ADDR 0
scripts/config_whitelist.txt +2 -1
@@ -252,6 +252,7 @@ CFG_VSC7385_IMAGE CFG_VSC7385_IMAGE_SIZE CFG_WATCHDOG_PRESC CFG_WATCHDOG_RC -CONFIG_X86_MRC_ADDR +CFG_X86EMU_RAW_IO +CFG_X86_MRC_ADDR CONFIG_X86_REFCODE_ADDR CONFIG_X86_REFCODE_RUN_ADDR
tools/binman/binman.rst +1 -1
@@ -298,7 +298,7 @@ C preprocessor:: #ifdef CONFIG_HAVE_MRC intel-mrc { - offset = <CONFIG_X86_MRC_ADDR>; + offset = <CFG_X86_MRC_ADDR>; }; #endif
Signature · 1 line
2.25.1
PATCH 239/241 global: Migrate CONFIG_X86_REFCODE_ADDR to CFG
In reply to Tom Rini--- arch/x86/cpu/broadwell/refcode.c | 2 +- arch/x86/dts/u-boot.dtsi | 2 +- include/configs/x86-chromebook.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/cpu/broadwell/refcode.c +1 -1
@@ -78,7 +78,7 @@ static int cpu_run_reference_code(void)int ret, dummy;int size; - hdr = (struct rmodule_header *)CONFIG_X86_REFCODE_ADDR ; + hdr = (struct rmodule_header *)CFG_X86_REFCODE_ADDR ;debug ("Extracting code from rmodule at %p\n" , hdr);if (hdr->magic !=RMODULE_MAGIC ) {debug ("Invalid rmodule magic\n" );
arch/x86/dts/u-boot.dtsi +1 -1
@@ -149,7 +149,7 @@ #endif #ifdef CONFIG_HAVE_REFCODE intel-refcode { - offset = <CONFIG_X86_REFCODE_ADDR>; + offset = <CFG_X86_REFCODE_ADDR>; }; #endif #ifdef CONFIG_TPL
include/configs/x86-chromebook.h +1 -1
@@ -7,7 +7,7 @@#define _X86_CHROMEBOOK_H#define CFG_X86_MRC_ADDR 0xfffa0000 -#define CONFIG_X86_REFCODE_ADDR 0xffea0000 +#define CFG_X86_REFCODE_ADDR 0xffea0000#define CONFIG_X86_REFCODE_RUN_ADDR 0#define VIDEO_IO_OFFSET 0
scripts/config_whitelist.txt +1 -1
@@ -254,5 +254,5 @@ CFG_WATCHDOG_PRESC CFG_WATCHDOG_RC CFG_X86EMU_RAW_IO CFG_X86_MRC_ADDR -CONFIG_X86_REFCODE_ADDR +CFG_X86_REFCODE_ADDR CONFIG_X86_REFCODE_RUN_ADDR
Signature · 1 line
2.25.1
PATCH 240/241 global: Migrate CONFIG_X86_REFCODE_RUN_ADDR to CFG
In reply to Tom Rini--- arch/x86/cpu/broadwell/refcode.c | 4 ++-- include/configs/x86-chromebook.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/cpu/broadwell/refcode.c +2 -2
@@ -99,7 +99,7 @@ static int cpu_run_reference_code(void) pei_data->saved_data = (void *)&dummy; src = (char *)hdr + hdr->payload_begin_offset; - dest = (char *)CONFIG_X86_REFCODE_RUN_ADDR ; + dest = (char *)CFG_X86_REFCODE_RUN_ADDR ; size = hdr->payload_end_offset - hdr->payload_begin_offset;debug ("Copying refcode from %p to %p, size %x\n" , src, dest, size);
@@ -112,7 +112,7 @@ static int cpu_run_reference_code(void) func = (asmlinkage int (*)(void *))dest;debug ("Running reference code at %p\n" , func);#ifdef DEBUG -print_buffer (CONFIG_X86_REFCODE_RUN_ADDR , (void *)func,1 ,0x40 ,0 ); +print_buffer (CFG_X86_REFCODE_RUN_ADDR , (void *)func,1 ,0x40 ,0 );#endif ret =func (pei_data);if (ret !=0 ) {
include/configs/x86-chromebook.h +1 -1
@@ -8,7 +8,7 @@#define CFG_X86_MRC_ADDR 0xfffa0000#define CFG_X86_REFCODE_ADDR 0xffea0000 -#define CONFIG_X86_REFCODE_RUN_ADDR 0 +#define CFG_X86_REFCODE_RUN_ADDR 0#define VIDEO_IO_OFFSET 0#define CFG_X86EMU_RAW_IO
scripts/config_whitelist.txt +1 -1
@@ -255,4 +255,4 @@ CFG_WATCHDOG_RC CFG_X86EMU_RAW_IO CFG_X86_MRC_ADDR CFG_X86_REFCODE_ADDR -CONFIG_X86_REFCODE_RUN_ADDR +CFG_X86_REFCODE_RUN_ADDR
Signature · 1 line
2.25.1
PATCH 241/241 Empty config_whitelist.txt
In reply to Tom Rini--- scripts/config_whitelist.txt | 258 ----------------------------------- 1 file changed, 258 deletions(-)
scripts/config_whitelist.txt +0 -258
@@ -1,258 +0,0 @@ -CFG_ARM_GIC_BASE_ADDRESS -CFG_BOARDDIR -CFG_DFU_ALT -CFG_DFU_ALT_BOOT_EMMC -CFG_DFU_ALT_BOOT_SD -CFG_DFU_ALT_SYSTEM -CFG_DFU_ENV_SETTINGS -CFG_DM9000_BASE -CFG_DM9000_BYTE_SWAPPED -CFG_DM9000_NO_SROM -CFG_DM9000_USE_16BIT -CFG_DW_WDT_CLOCK_KHZ -CFG_ENV_FLAGS_LIST_STATIC -CFG_ENV_IS_EMBEDDED -CFG_ENV_SETTINGS_BUTTONS_AND_LEDS -CFG_ENV_SETTINGS_NAND_V1 -CFG_ENV_SETTINGS_NAND_V2 -CFG_ENV_SETTINGS_V1 -CFG_ENV_SETTINGS_V2 -CFG_ENV_SROM_BANK -CFG_ENV_TOTAL_SIZE -CFG_ET1100_BASE -CFG_ETHBASE -CFG_EXTRA_ENV_SETTINGS -CFG_FB_ADDR -CFG_FDTADDR -CFG_FDTFILE -CFG_FEC_ENET_DEV -CFG_FEC_FIXED_SPEED -CFG_FEC_MXC_PHYADDR -CFG_FLASH_BR_PRELIM -CFG_FLASH_OR_PRELIM -CFG_FLASH_SECTOR_SIZE -CFG_FLASH_SHOW_PROGRESS -CFG_FLASH_SPANSION_S29WS_N -CFG_FLASH_VERIFY -CFG_FM_PLAT_CLK_DIV -CFG_FSL_CPLD -CFG_FSL_ESDHC_PIN_MUX -CFG_FSL_FM_10GEC_REGULAR_NOTATION -CFG_FSL_ISBC_KEY_EXT -CFG_FSL_PMIC_BITLEN -CFG_FSL_PMIC_BUS -CFG_FSL_PMIC_CLK -CFG_FSL_PMIC_CS -CFG_FSL_PMIC_MODE -CFG_FSL_SDHC_V2_3 -CFG_FSL_SERDES1 -CFG_FSL_SERDES2 -CFG_GATEWAYIP -CFG_GMII -CFG_G_DNL_THOR_PRODUCT_NUM -CFG_G_DNL_THOR_VENDOR_NUM -CFG_G_DNL_UMS_PRODUCT_NUM -CFG_G_DNL_UMS_VENDOR_NUM -CFG_HDMI_ENCODER_I2C_ADDR -CFG_HOSTNAME -CFG_HSMMC2_8BIT -CFG_HW_ENV_SETTINGS -CFG_I2C_ENV_EEPROM_BUS -CFG_I2C_MULTI_BUS -CFG_I2C_MVTWSI -CFG_I2C_MVTWSI_BASE0 -CFG_I2C_MVTWSI_BASE1 -CFG_I2C_RTC_ADDR -CFG_ICS307_REFCLK_HZ -CFG_IMX6_PWM_PER_CLK -CFG_IPADDR -CFG_IRAM_BASE -CFG_IRAM_END -CFG_IRAM_SIZE -CFG_IRAM_TOP -CFG_KM_DEF_ARCH -CFG_KM_DEF_BOOT_ARGS_CPU -CFG_KM_DEF_ENV -CFG_KM_DEF_ENV_BOOTARGS -CFG_KM_DEF_ENV_BOOTPARAMS -CFG_KM_DEF_ENV_BOOTTARGETS -CFG_KM_DEF_ENV_CONSTANTS -CFG_KM_DEF_ENV_CPU -CFG_KM_DEF_ENV_FLASH_BOOT -CFG_KM_DEV_ENV_FLASH_BOOT_UBI -CFG_KM_ECC_MODE -CFG_KM_NEW_ENV -CFG_KM_UBI_LINUX_MTD -CFG_KM_UBI_PARTITION_NAME_APP -CFG_KM_UBI_PARTITION_NAME_BOOT -CFG_KM_UBI_PART_BOOT_OPTS -CFG_KM_UIMAGE_NAME -CFG_KSNET_CPSW_NUM_PORTS -CFG_KSNET_MAC_ID_BASE -CFG_KSNET_MDIO_PHY_CONFIG_ENABLE -CFG_KSNET_NETCP_BASE -CFG_KSNET_NETCP_V1_0 -CFG_KSNET_NETCP_V1_5 -CFG_KSNET_SERDES_LANES_PER_SGMII -CFG_KSNET_SERDES_SGMII2_BASE -CFG_KSNET_SERDES_SGMII_BASE -CFG_L1_INIT_RAM -CFG_L2_CACHE -CFG_LEGACY_BOOTCMD_ENV -CFG_LOWPOWER_ADDR -CFG_LOWPOWER_FLAG -CFG_LPC32XX_NAND_MLC_BUSY_DELAY -CFG_LPC32XX_NAND_MLC_NAND_TA -CFG_LPC32XX_NAND_MLC_RD_HIGH -CFG_LPC32XX_NAND_MLC_RD_LOW -CFG_LPC32XX_NAND_MLC_TCEA_DELAY -CFG_LPC32XX_NAND_MLC_WR_HIGH -CFG_LPC32XX_NAND_MLC_WR_LOW -CFG_LPC32XX_NAND_SLC_RDR_CLKS -CFG_LPC32XX_NAND_SLC_RHOLD -CFG_LPC32XX_NAND_SLC_RSETUP -CFG_LPC32XX_NAND_SLC_RWIDTH -CFG_LPC32XX_NAND_SLC_WDR_CLKS -CFG_LPC32XX_NAND_SLC_WHOLD -CFG_LPC32XX_NAND_SLC_WSETUP -CFG_LPC32XX_NAND_SLC_WWIDTH -CFG_MACB_SEARCH_PHY -CFG_MALLOC_F_ADDR -CFG_MALTA -CFG_MAX_DSP_CPUS -CFG_MAX_MEM_MAPPED -CFG_MAX_RAM_BANK_SIZE -CFG_MEMSIZE_IN_BYTES -CFG_MEM_INIT_VALUE -CFG_MFG_ENV_SETTINGS -CFG_MII_DEFAULT_TSEC -CFG_MIU_2BIT_21_7_INTERLEAVED -CFG_MIU_2BIT_INTERLEAVED -CFG_MMC_DEFAULT_DEV -CFG_MMC_SUNXI_SLOT -CFG_MONITOR_IS_IN_RAM -CFG_MTD_NAND_VERIFY_WRITE -CFG_MVGBE_PORTS -CFG_MXC_GPT_HCLK -CFG_MXC_NAND_HWECC -CFG_MXC_NAND_IP_REGS_BASE -CFG_MXC_NAND_REGS_BASE -CFG_MXC_UART_BASE -CFG_MXC_USB_FLAGS -CFG_MXC_USB_PORT -CFG_MXC_USB_PORTSC -CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC -CFG_NAND_CS_INIT -CFG_NETDEV -CFG_NETMASK -CFG_NORBOOT -CFG_NUM_DSP_CPUS -CFG_ODROID_REV_AIN -CFG_OTHBOOTARGS -CFG_OVERWRITE_ETHADDR_ONCE -CFG_PCIE_IMX_PERST_GPIO -CFG_PCIE_IMX_POWER_GPIO -CFG_PEN_ADDR_BIG_ENDIAN -CFG_PHY_BASE_ADR -CFG_PHY_ET1011C_TX_CLK_FIX -CFG_PHY_ID -CFG_PHY_INTERFACE_MODE -CFG_PHY_IRAM_BASE -CFG_PL011_CLOCK -CFG_PL01x_PORTS -CFG_PME_PLAT_CLK_DIV -CFG_POSTBOOTMENU -CFG_POWER_LTC3676_I2C_ADDR -CFG_POWER_PFUZE100_I2C_ADDR -CFG_POWER_PFUZE3000_I2C_ADDR -CFG_PPC_SPINTABLE_COMPATIBLE -CFG_PRAM -CFG_PSRAM_SCFG -CFG_QBMAN_CLK_DIV -CFG_RAMBOOT_SPIFLASH -CFG_RAMBOOT_TEXT_BASE -CFG_RAMDISK_ADDR -CFG_RD_LVL -CFG_RESET_VECTOR_ADDRESS -CFG_ROCKCHIP_SDHCI_MAX_FREQ -CFG_ROOTPATH -CFG_SANDBOX_ARCH -CFG_SANDBOX_SPI_MAX_BUS -CFG_SANDBOX_SPI_MAX_CS -CFG_SAR2_REG -CFG_SAR_REG -CFG_SCIF_A -CFG_SCSI_DEV_LIST -CFG_SC_TIMER_CLK -CFG_SERIAL_BOOT -CFG_SERVERIP -CFG_SETUP_INITRD_TAG -CFG_SET_DFU_ALT_BUF_LEN -CFG_SH_ETHER_ALIGNE_SIZE -CFG_SH_ETHER_CACHE_INVALIDATE -CFG_SH_ETHER_CACHE_WRITEBACK -CFG_SH_ETHER_PHY_ADDR -CFG_SH_ETHER_PHY_MODE -CFG_SH_ETHER_USE_PORT -CFG_SH_QSPI_BASE -CFG_SLIC -CFG_SMDK5420 -CFG_SMP_PEN_ADDR -CFG_SOCRATES -CFG_SPI_ADDR -CFG_SPI_BOOTING -CFG_SPI_FLASH_QUAD -CFG_SPI_FLASH_SIZE -CFG_SPI_HALF_DUPLEX -CFG_SPI_N25Q256A_RESET -CFG_STACKBASE -CFG_STANDALONE_LOAD_ADDR -CFG_STD_DEVICES_SETTINGS -CFG_TEGRA_BOARD_STRING -CFG_TEGRA_ENABLE_UARTA -CFG_TEGRA_ENABLE_UARTD -CFG_TEGRA_SLINK_CTRLS -CFG_TEGRA_SPI -CFG_TEGRA_UARTA_GPU -CFG_TEGRA_UARTA_SDIO1 -CFG_TEGRA_VDD_CORE_TPS62361B_SET3 -CFG_TEGRA_VDD_CORE_TPS62366A_SET1 -CFG_TESTPIN_MASK -CFG_TESTPIN_REG -CFG_THOR_RESET_OFF -CFG_TPM_TIS_BASE_ADDRESS -CFG_TSEC1 -CFG_TSEC1_NAME -CFG_TSEC2 -CFG_TSEC2_NAME -CFG_TSEC3 -CFG_TSEC3_NAME -CFG_TSEC4 -CFG_TSEC4_NAME -CFG_TSECV2 -CFG_TSECV2_1 -CFG_TSEC_TBICR_SETTINGS -CFG_UBIFS_VOLUME -CFG_UBI_PART -CFG_UBOOTPATH -CFG_UBOOT_SECTOR_COUNT -CFG_UBOOT_SECTOR_START -CFG_UEC_ETH -CFG_USART_BASE -CFG_USART_ID -CFG_USBD_HS -CFG_USB_BOOTING -CFG_USB_EXT2_BOOT -CFG_USB_FAT_BOOT -CFG_USB_ISP1301_I2C_ADDR -CFG_U_BOOT_HDR_SIZE -CFG_VAR_SIZE_SPL -CFG_VERY_BIG_RAM -CFG_VSC7385_IMAGE -CFG_VSC7385_IMAGE_SIZE -CFG_WATCHDOG_PRESC -CFG_WATCHDOG_RC -CFG_X86EMU_RAW_IO -CFG_X86_MRC_ADDR -CFG_X86_REFCODE_ADDR -CFG_X86_REFCODE_RUN_ADDR
Signature · 1 line
2.25.1
Re: [000/241] Finish migration to Kconfig or CFG namespace
In reply to Tom RiniHi Tom,
Quoted 10 lines · Tom Rini
Hey all,
The intention of this series isn't to apply it just yet. This was a very quick scripted migration and so there's cases where we do more than one symbol, or we can see there's define but unused symbols. But it also shows that with the last few series I've posted, we're nearly done. With this series applied, everything builds still, and the resulting binaries seem to be the same (I'm doing a build where I keep before/after so I can check checksums now).
It's great to see this? When will it be applied? Perhaps when -next opens up?
Regards,
Simon
Re: [000/241] Finish migration to Kconfig or CFG namespace
Quoted 14 lines · Simon Glass
Hi Tom,
Quoted 10 lines · Tom Rini
Hey all,
The intention of this series isn't to apply it just yet. This was a very quick scripted migration and so there's cases where we do more than one symbol, or we can see there's define but unused symbols. But it also shows that with the last few series I've posted, we're nearly done. With this series applied, everything builds still, and the resulting binaries seem to be the same (I'm doing a build where I keep before/after so I can check checksums now).
Quoted 1 line
It's great to see this? When will it be applied? Perhaps when -next opens up?
Everything leading up to this will go in to -next. I have a handful of notes already on symbols that should get migrated to Kconfig or removed outright after skimming this series, and making that be real is the next step. Then re-running the scripted everything-else series and applying.
Signature · 1 line
Tom
PATCH 1/41 xenguest_arm64: Disable networking support more fully
In reply to Tom RiniThis platform had largely disabled networking support before. More completely disable it by turning off CONFIG_NET.
--- configs/xenguest_arm64_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
configs/xenguest_arm64_defconfig +1 -1
@@ -35,10 +35,10 @@ CONFIG_CMD_PVBLOCK=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set # CONFIG_CMD_SLEEP is not set CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +# CONFIG_NET is not set # CONFIG_MMC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_DM_SERIAL=y
Signature · 1 line
2.25.1
PATCH 2/41 LicheePi_Zero: Disable networking support more fully
This platform had largely disabled networking support before. More completely disable it by turning off CONFIG_NET.
--- configs/LicheePi_Zero_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
configs/LicheePi_Zero_defconfig +1 -1
@@ -6,4 +6,4 @@ CONFIG_MACH_SUN8I_V3S=y CONFIG_DRAM_CLK=360 # CONFIG_HAS_ARMV7_SECURE_BASE is not set CONFIG_SYS_MONITOR_LEN=786432 -# CONFIG_NETDEVICES is not set +# CONFIG_NET is not set
Signature · 1 line
2.25.1
PATCH 3/41 pinecube: Disable networking support more fully
In reply to Tom RiniThis platform had largely disabled networking support before. More completely disable it by turning off CONFIG_NET.
--- configs/pinecube_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
configs/pinecube_defconfig +1 -1
@@ -10,12 +10,12 @@ CONFIG_I2C0_ENABLE=y # CONFIG_HAS_ARMV7_SECURE_BASE is not set CONFIG_SYS_MONITOR_LEN=786432 CONFIG_SPL_I2C=y +# CONFIG_NET is not set CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MVTWSI=y CONFIG_SYS_I2C_SLAVE=0x7f CONFIG_SYS_I2C_SPEED=400000 CONFIG_SPI_FLASH_WINBOND=y -# CONFIG_NETDEVICES is not set CONFIG_AXP209_POWER=y CONFIG_AXP_DCDC2_VOLT=1250 CONFIG_AXP_DCDC3_VOLT=3300
Signature · 1 line
2.25.1
PATCH 4/41 topic_miami*: Disable networking support more fully
In reply to Tom RiniThis platform had largely disabled networking support before. More completely disable it by turning off CONFIG_NET.
--- configs/topic_miami_defconfig | 2 +- configs/topic_miamilite_defconfig | 2 +- configs/topic_miamiplus_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
configs/topic_miami_defconfig +1 -1
@@ -46,11 +46,11 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y CONFIG_OF_EMBED=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +# CONFIG_NET is not set CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_RAM=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
configs/topic_miamilite_defconfig +1 -1
@@ -46,11 +46,11 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y CONFIG_OF_EMBED=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +# CONFIG_NET is not set CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_RAM=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
configs/topic_miamiplus_defconfig +1 -1
@@ -50,6 +50,7 @@ CONFIG_CMD_CACHE=y CONFIG_OF_EMBED=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +# CONFIG_NET is not set CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_RAM=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
@@ -62,7 +63,6 @@ CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SF_DEFAULT_SPEED=108000000 CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set -# CONFIG_NETDEVICES is not set CONFIG_DEBUG_UART_ZYNQ=y CONFIG_ARM_DCC=y CONFIG_ZYNQ_SERIAL=y
Signature · 1 line
2.25.1
Re: [PATCH 04/41] topic_miami*: Disable networking support more fully
Looks fine to me,
(PS: Sorry for top-posting, but otherwise our M$ mailserver will mangle it)
Met vriendelijke groet / kind regards,
Mike Looijmans
System Expert
TOPIC Embedded Products B.V.
Materiaalweg 4, 5681 RJ Best
The Netherlands
T: +31 (0) 499 33 69 69
E: [email protected]
W: www.topic.nl
Please consider the environment before printing this e-mail
Quoted 65 lines · Tom Rini
This platform had largely disabled networking support before. More completely disable it by turning off
CONFIG_NET.Cc Mike Looijmans <[email protected]>Signed-off-by Tom Rini <[email protected]>--- configs/topic_miami_defconfig | 2 +- configs/topic_miamilite_defconfig | 2 +- configs/topic_miamiplus_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)configs/topic_miami_defconfig +1
-1@@ -46,11 +46,11 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y CONFIG_OF_EMBED=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +# CONFIG_NET is not set CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_RAM=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000configs/topic_miamilite_defconfig +1
-1@@ -46,11 +46,11 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y CONFIG_OF_EMBED=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +# CONFIG_NET is not set CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_RAM=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000configs/topic_miamiplus_defconfig +1
-1@@ -50,6 +50,7 @@ CONFIG_CMD_CACHE=y CONFIG_OF_EMBED=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +# CONFIG_NET is not set CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_RAM=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000@@ -62,7 +63,6 @@ CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SF_DEFAULT_SPEED=108000000 CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set -# CONFIG_NETDEVICES is not set CONFIG_DEBUG_UART_ZYNQ=y CONFIG_ARM_DCC=y CONFIG_ZYNQ_SERIAL=y
Signature · 1 line
Mike Looijmans
PATCH 5/41 chromebook_samus_tpl: Disable SPL networking
In reply to Tom RiniWe don't appear to actually use networking in SPL here, disable it.
--- configs/chromebook_samus_tpl_defconfig | 1 - 1 file changed, 1 deletion(-)
configs/chromebook_samus_tpl_defconfig +0 -1
@@ -39,7 +39,6 @@ CONFIG_SPL_NO_BSS_LIMIT=y CONFIG_HANDOFF=y CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_DM_SPI_FLASH=y -CONFIG_SPL_NET=y CONFIG_SPL_PCI=y CONFIG_SPL_PCH=y CONFIG_TPL_PCI=y
Signature · 1 line
2.25.1
Re: [PATCH 05/41] chromebook_samus_tpl: Disable SPL networking
Quoted 9 lines · Tom Rini
We don't appear to actually use networking in SPL here, disable it.
Cc Simon Glass <[email protected]>Signed-off-by Tom Rini <[email protected]>--- configs/chromebook_samus_tpl_defconfig | 1 - 1 file changed, 1 deletion(-)
PATCH 6/41 sunxi: Move MMC_SUNXI_SLOT to Kconfig
In reply to Tom RiniThis value is always defined to 0, so move it to Kconfig as being set to always 0.
Cc: Andre Przywara <[email protected]>
C: Icenowy Zheng <[email protected]>
--- arch/arm/mach-sunxi/Kconfig | 4 ++++ include/configs/sunxi-common.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-)
arch/arm/mach-sunxi/Kconfig +4 -0
@@ -685,6 +685,10 @@ config MMC1_PINS_PH ---help--- Select this option for boards where mmc1 uses the Port H pinmux. +config MMC_SUNXI_SLOT + int + default 0 + config MMC_SUNXI_SLOT_EXTRA int "mmc extra slot number" default -1
include/configs/sunxi-common.h +0 -3
@@ -69,9 +69,6 @@#define PHYS_SDRAM_0 CFG_SYS_SDRAM_BASE#define PHYS_SDRAM_0_SIZE 0x80000000/* 2 GiB */ -/* mmc config */ -#define CONFIG_MMC_SUNXI_SLOT 0 -/* * Miscellaneous configurable options */
Signature · 1 line
2.25.1
Re: [PATCH 06/41] sunxi: Move MMC_SUNXI_SLOT to Kconfig
On Sun, 27 Nov 2022 10:25:01 -0500
Tom Rini <[email protected]> wrote:
Hi Tom,
Quoted 2 lines
This value is always defined to 0, so move it to
Kconfigas being set to always 0.
Yeah, but that's not needed in Kconfig at all, it's just a name for the first MMC slot, its definition being misplaced in the config directory. I will send a patch that removes the CONFIG_ prefix and moves it into the C file using it, so you can drop this patch here.
Thanks,
Andre
Quoted 37 lines
Cc: Andre Przywara <[email protected]>
C: Icenowy Zheng <[email protected]>Signed-off-by Tom Rini <[email protected]>--- arch/arm/mach-sunxi/Kconfig | 4 ++++ include/configs/sunxi-common.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-)arch/arm/mach-sunxi/Kconfig +4
-0@@ -685,6 +685,10 @@ config MMC1_PINS_PH ---help--- Select this option for boards where mmc1 uses the Port H pinmux. +config MMC_SUNXI_SLOT + int + default 0 + config MMC_SUNXI_SLOT_EXTRA int "mmc extra slot number" default -1include/configs/sunxi-common.h +0
-3@@ -69,9 +69,6 @@#define PHYS_SDRAM_0 CFG_SYS_SDRAM_BASE#define PHYS_SDRAM_0_SIZE 0x80000000/* 2 GiB */ -/* mmc config */ -#define CONFIG_MMC_SUNXI_SLOT 0 -/* * Miscellaneous configurable options */
Re: [PATCH 06/41] sunxi: Move MMC_SUNXI_SLOT to Kconfig
Quoted 5 lines · Andre Przywara
On Sun, 27 Nov 2022 10:25:01 -0500
Tom Rini <[email protected]> wrote:Hi Tom,
Quoted 7 lines
Quoted 2 lines
This value is always defined to 0, so move it to
Kconfigas being set to always 0.Yeah, but that's not needed in
Kconfigat all, it's just a name for the first MMC slot, its definition being misplaced in the config directory. I will send a patch that removes theCONFIG_prefix and moves it into the C file using it, so you can drop this patch here.
That works for me, thanks!
Signature · 1 line
Tom
PATCH 7/41 net: Remove extraneous dependencies
In reply to Tom RiniWith DM_ETH being required now for all drivers, we don't need this listed on individual drivers as well.
--- drivers/net/Kconfig | 4 ++-- drivers/net/bnxt/Kconfig | 1 - drivers/net/mscc_eswitch/Kconfig | 10 +++++----- drivers/net/phy/Kconfig | 3 --- drivers/net/qe/Kconfig | 1 - 5 files changed, 7 insertions(+), 12 deletions(-)
drivers/net/Kconfig +2 -2
@@ -1,7 +1,6 @@ source "drivers/net/phy/Kconfig" source "drivers/net/pfe_eth/Kconfig" source "drivers/net/fsl-mc/Kconfig" -source "drivers/net/bnxt/Kconfig" config ETH def_bool y
@@ -175,6 +174,8 @@ config BCMGENET help This driver supports the BCMGENET Ethernet MAC. +source "drivers/net/bnxt/Kconfig" + config CORTINA_NI_ENET bool "Cortina-Access Ethernet driver" depends on CORTINA_PLATFORM
@@ -716,7 +717,6 @@ config RENESAS_RAVB config MPC8XX_FEC bool "Fast Ethernet Controller on MPC8XX" depends on MPC8xx - depends on DM_ETH select MII select SYS_DISCOVER_PHY help
drivers/net/bnxt/Kconfig +0 -1
@@ -1,6 +1,5 @@ config BNXT_ETH bool "BNXT PCI support" - depends on DM_ETH select PCI_INIT_R help This driver implements support for bnxt pci controller
drivers/net/mscc_eswitch/Kconfig +5 -5
@@ -4,35 +4,35 @@ config MSCC_OCELOT_SWITCH bool "Ocelot switch driver" - depends on DM_ETH && ARCH_MSCC + depends on ARCH_MSCC select PHYLIB help This driver supports the Ocelot network switch device. config MSCC_LUTON_SWITCH bool "Luton switch driver" - depends on DM_ETH && ARCH_MSCC + depends on ARCH_MSCC select PHYLIB help This driver supports the Luton network switch device. config MSCC_JR2_SWITCH bool "Jaguar2 switch driver" - depends on DM_ETH && ARCH_MSCC + depends on ARCH_MSCC select PHYLIB help This driver supports the Jaguar2 network switch device. config MSCC_SERVALT_SWITCH bool "Servalt switch driver" - depends on DM_ETH && ARCH_MSCC + depends on ARCH_MSCC select PHYLIB help This driver supports the Servalt network switch device. config MSCC_SERVAL_SWITCH bool "Serval switch driver" - depends on DM_ETH && ARCH_MSCC + depends on ARCH_MSCC select PHYLIB help This driver supports the Serval network switch device.
drivers/net/phy/Kconfig +0 -3
@@ -315,7 +315,6 @@ config PHY_XILINX config PHY_XILINX_GMII2RGMII bool "Xilinx GMII to RGMII Ethernet PHYs support" - depends on DM_ETH help This adds support for Xilinx GMII to RGMII IP core. This IP acts as bridge between MAC connected over GMII and external phy that
@@ -331,7 +330,6 @@ config PHY_ETHERNET_ID config PHY_FIXED bool "Fixed-Link PHY" - depends on DM_ETH help Fixed PHY is used for having a 'fixed-link' to another MAC with a direct connection (MII, RGMII, ...).
@@ -341,7 +339,6 @@ config PHY_FIXED config PHY_NCSI bool "NC-SI based PHY" - depends on DM_ETH endif #PHYLIB
drivers/net/qe/Kconfig +0 -1
@@ -4,6 +4,5 @@ config QE_UEC bool "NXP QE UEC Ethernet controller" - depends on DM_ETH help This driver supports the NXP QE UEC ethernet controller
Signature · 1 line
2.25.1
PATCH 8/41 global: Remove extraneous DM_ETH imply/select
In reply to Tom RiniWe only need to enable DM_ETH if we have a networking driver. All networking drivers depend on DM_ETH being enabled, and their selection ensures DM_ETH will be enabled.
--- arch/Kconfig | 2 -- arch/arm/Kconfig | 13 ------------- arch/arm/mach-at91/Kconfig | 4 ---- arch/arm/mach-imx/mx5/Kconfig | 1 - arch/arm/mach-imx/mx6/Kconfig | 16 ---------------- arch/arm/mach-omap2/am33xx/Kconfig | 1 - arch/arm/mach-snapdragon/Kconfig | 2 -- arch/arm/mach-tegra/Kconfig | 1 - arch/mips/Kconfig | 4 ---- board/armltd/vexpress64/Kconfig | 1 - board/keymile/km83xx/Kconfig | 1 - board/tq/tqma6/Kconfig | 1 - 12 files changed, 47 deletions(-)
arch/Kconfig +0 -2
@@ -113,7 +113,6 @@ config RISCV select DM select SPL_SEPARATE_BSS if SPL imply DM_SERIAL - imply DM_ETH imply DM_EVENT imply DM_MMC imply DM_SPI
@@ -241,7 +240,6 @@ config X86 imply CMD_SF imply CMD_SF_TEST imply CMD_ZBOOT - imply DM_ETH imply DM_EVENT imply DM_GPIO imply DM_KEYBOARD
arch/arm/Kconfig +0 -13
@@ -632,7 +632,6 @@ config ARCH_KIRKWOOD config ARCH_MVEBU bool "Marvell MVEBU family (Armada XP/375/38x/3700/7K/8K)" select DM - select DM_ETH select DM_SERIAL select DM_SPI select DM_SPI_FLASH
@@ -736,7 +735,6 @@ config ARCH_EXYNOS select DM select DM_GPIO select DM_I2C - select DM_ETH select DM_KEYBOARD select DM_SERIAL select DM_SPI
@@ -767,7 +765,6 @@ config ARCH_HIGHBANK select CLK select CLK_CCF select AHCI - select DM_ETH select PHYS_64BIT select TIMER select SP804_TIMER
@@ -1041,7 +1038,6 @@ config ARCH_APPLE config ARCH_OWL bool "Actions Semi OWL SoCs" select DM - select DM_ETH select DM_SERIAL select GPIO_EXTRA_HEADER select OWL_SERIAL
@@ -1141,7 +1137,6 @@ config ARCH_SUNXI select CMD_USB if DISTRO_DEFAULTS && USB_HOST select CLK select DM - select DM_ETH select DM_GPIO select DM_I2C if I2C select DM_SPI if SPI
@@ -1220,7 +1215,6 @@ config ARCH_VERSAL select ARM64 select CLK select DM - select DM_ETH if NET select DM_MMC if MMC select DM_SERIAL select GICV3
@@ -1234,7 +1228,6 @@ config ARCH_VERSAL_NET select ARM64 select CLK select DM - select DM_ETH if NET select DM_MMC if MMC select DM_SERIAL select OF_CONTROL
@@ -1259,7 +1252,6 @@ config ARCH_ZYNQ select CPU_V7A select DEBUG_UART_BOARD_INIT if SPL && DEBUG_UART select DM - select DM_ETH if NET select DM_MMC if MMC select DM_SERIAL select DM_SPI
@@ -1289,7 +1281,6 @@ config ARCH_ZYNQMP_R5 select CLK select CPU_V7R select DM - select DM_ETH if NET select DM_MMC if MMC select DM_SERIAL select OF_CONTROL
@@ -1302,7 +1293,6 @@ config ARCH_ZYNQMP select CLK select DM select DEBUG_UART_BOARD_INIT if SPL && DEBUG_UART - select DM_ETH if NET select DM_MAILBOX select DM_MMC if MMC select DM_SERIAL
@@ -1849,7 +1839,6 @@ config TARGET_SL28 select DM_I2C select DM_MMC select DM_SPI_FLASH - select DM_ETH select DM_MDIO select PCI select DM_RNG
@@ -1886,7 +1875,6 @@ config ARCH_UNIPHIER bool "Socionext UniPhier SoCs" select BOARD_LATE_INIT select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_MMC
@@ -2072,7 +2060,6 @@ config TARGET_POMELO select SCSI select DM_SCSI select DM_SERIAL - select DM_ETH if NET imply CMD_PCI help Support for pomelo platform.
arch/arm/mach-at91/Kconfig +0 -4
@@ -85,7 +85,6 @@ config TARGET_GURNARD select AT91_WANTS_COMMON_PHY select BOARD_LATE_INIT select DM - select DM_ETH select DM_GPIO select DM_SERIAL select DM_SPI
@@ -253,7 +252,6 @@ config TARGET_CORVUS select AT91SAM9M10G45 select AT91_WANTS_COMMON_PHY select DM - select DM_ETH select DM_GPIO select DM_SERIAL select SUPPORT_SPL
@@ -271,7 +269,6 @@ config TARGET_TAURUS select AT91SAM9G20 select AT91_WANTS_COMMON_PHY select DM - select DM_ETH select DM_GPIO select DM_SERIAL select DM_SPI
@@ -284,7 +281,6 @@ config TARGET_SMARTWEB select AT91SAM9260 select AT91_WANTS_COMMON_PHY select DM - select DM_ETH select DM_GPIO select DM_SERIAL select SUPPORT_SPL
arch/arm/mach-imx/mx5/Kconfig +0 -1
@@ -22,7 +22,6 @@ config TARGET_KP_IMX53 bool "Support K+P imx53 board" select BOARD_LATE_INIT select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_PMIC
arch/arm/mach-imx/mx6/Kconfig +0 -16
@@ -174,7 +174,6 @@ config TARGET_DART_6UL bool "Variscite imx6ULL dart(DART-SOM-6ULL)" depends on MX6ULL select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_MMC
@@ -197,7 +196,6 @@ config TARGET_DISPLAY5 bool "LWN DISPLAY5 board" depends on MX6Q select DM - select DM_ETH select DM_I2C select DM_MMC select DM_SPI
@@ -245,7 +243,6 @@ config TARGET_KONTRON_MX6UL config TARGET_KOSAGI_NOVENA bool "Kosagi Novena" select BOARD_LATE_INIT - select DM_ETH select DM_GPIO select DM_MMC select PCI
@@ -261,7 +258,6 @@ config TARGET_MCCMON6 select SUPPORT_SPL select DM select DM_GPIO - select DM_ETH select DM_SERIAL select DM_I2C select DM_SPI
@@ -280,7 +276,6 @@ config TARGET_MX6LOGICPD select BOARD_EARLY_INIT_F select BOARD_LATE_INIT select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_MMC
@@ -301,7 +296,6 @@ config TARGET_MX6DL_MAMOJ bool "Support BTicino Mamoj" depends on MX6QDL select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_MMC
@@ -334,7 +328,6 @@ config TARGET_MX6Q_ENGICAM depends on MX6QDL select BOARD_LATE_INIT select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_MMC
@@ -355,7 +348,6 @@ config TARGET_MX6Q_ACC select OF_CONTROL select SPL_OF_LIBFDT select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_MMC
@@ -447,7 +439,6 @@ config TARGET_MX6UL_ENGICAM depends on MX6UL select BOARD_LATE_INIT select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_MMC
@@ -484,7 +475,6 @@ config TARGET_MYS_6ULX bool "MYiR MYS-6ULX" depends on MX6ULL select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_MMC
@@ -504,7 +494,6 @@ config TARGET_NPI_IMX6ULL bool "Seeed NPI-IMX6ULL" depends on MX6ULL select DM - select DM_ETH select DM_MMC select DM_GPIO select DM_SERIAL
@@ -552,7 +541,6 @@ config TARGET_PCL063 bool "PHYTEC PCL063 (phyCORE-i.MX6UL)" depends on MX6UL select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_MMC
@@ -564,7 +552,6 @@ config TARGET_PCL063_ULL bool "PHYTEC PCL063 (phyCORE-i.MX6ULL)" depends on MX6ULL select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_MMC
@@ -577,7 +564,6 @@ config TARGET_SOMLABS_VISIONSOM_6ULL depends on MX6ULL select BOARD_LATE_INIT select DM - select DM_ETH select DM_GPIO select DM_MMC select DM_SERIAL
@@ -597,7 +583,6 @@ config TARGET_KP_IMX6Q_TPC select SPL_DM if SPL select DM_THERMAL select DM_MMC - select DM_ETH select DM_REGULATOR select SPL_DM_REGULATOR if SPL select DM_SERIAL
@@ -661,7 +646,6 @@ config TARGET_BRPPT2 select OF_CONTROL select SPL_OF_LIBFDT select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_MMC
arch/arm/mach-omap2/am33xx/Kconfig +0 -1
@@ -230,7 +230,6 @@ config TARGET_AM43XX_EVM bool "Support am43xx_evm" select BOARD_LATE_INIT select TI_I2C_BOARD_DETECT - imply DM_ETH imply DM_I2C imply DM_SPI imply DM_SPI_FLASH
arch/arm/mach-snapdragon/Kconfig +0 -2
@@ -55,7 +55,6 @@ config TARGET_DRAGONBOARD845C - 64GiB UFS drive select MISC_INIT_R select SDM845 - select DM_ETH if NET config TARGET_STARQLTECHN bool "Samsung S9 SM-G9600(starqltechn)"
@@ -67,7 +66,6 @@ config TARGET_STARQLTECHN - 64GiB UFS drive select MISC_INIT_R select SDM845 - select DM_ETH if NET config TARGET_QCS404EVB bool "Qualcomm Technologies, Inc. QCS404 EVB"
arch/arm/mach-tegra/Kconfig +0 -1
@@ -44,7 +44,6 @@ config TEGRA_COMMON select BOARD_EARLY_INIT_F select CLK select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_KEYBOARD
arch/mips/Kconfig +0 -4
@@ -19,7 +19,6 @@ config TARGET_MALTA select DM select DM_SERIAL select PCI - select DM_ETH select DYNAMIC_IO_PORT_BASE select MIPS_CM select MIPS_INSERT_BOOT_CONFIG
@@ -71,7 +70,6 @@ config ARCH_MTMIPS imply CMD_DM select DISPLAY_CPUINFO select DM - imply DM_ETH imply DM_GPIO select DM_RESET select DM_SERIAL
@@ -104,7 +102,6 @@ config ARCH_OCTEON select DISPLAY_CPUINFO select DMA_ADDR_T_64BIT select DM - select DM_ETH select DM_GPIO select DM_I2C select DM_SERIAL
@@ -153,7 +150,6 @@ config TARGET_XILFPGA bool "Support Imagination Xilfpga" select HAS_FIXED_TIMER_FREQUENCY select DM - select DM_ETH select DM_GPIO select DM_SERIAL select SYS_CACHE_SHIFT_4
board/armltd/vexpress64/Kconfig +0 -1
@@ -14,7 +14,6 @@ config VEXPRESS64_BASE_MODEL select SEMIHOSTING select VIRTIO_BLK if VIRTIO_MMIO select VIRTIO_NET if VIRTIO_MMIO - select DM_ETH if VIRTIO_NET select LINUX_KERNEL_IMAGE_HEADER select POSITION_INDEPENDENT
board/keymile/km83xx/Kconfig +0 -1
@@ -6,7 +6,6 @@ config KM_ENABLE_FULL_DM_DTS_SUPPORT default y select CMD_DM select DM - select DM_ETH select DM_MDIO select DM_SERIAL select OF_CONTROL
board/tq/tqma6/Kconfig +0 -1
@@ -63,7 +63,6 @@ choice config MBA6 bool "TQMa6 on MBa6 Starterkit" - select DM_ETH select USB select CMD_USB select USB_STORAGE
Signature · 1 line
2.25.1
PATCH 9/41 net: tsec: Remove non-DM_ETH support code
In reply to Tom RiniAs DM_ETH is required for all network drivers, it's now safe to remove the non-DM_ETH support code. Doing this removes some board support code which was also unused. Finally, this removes some CONFIG symbols that otherwise needed to be migrated to Kconfig, but were unused in code now.
--- arch/arm/include/asm/arch-ls102xa/config.h | 5 - arch/powerpc/include/asm/config_mpc85xx.h | 17 -- arch/powerpc/include/asm/immap_83xx.h | 5 - arch/powerpc/include/asm/immap_85xx.h | 8 - board/freescale/common/pixis.c | 73 ------- board/freescale/mpc8548cds/mpc8548cds.c | 82 -------- board/freescale/p1010rdb/p1010rdb.c | 43 ----- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 50 ----- drivers/net/tsec.c | 199 +------------------- include/configs/MPC837XERDB.h | 27 --- include/configs/MPC8548CDS.h | 27 --- include/configs/P1010RDB.h | 31 --- include/configs/ls1021aiot.h | 21 --- include/configs/ls1021aqds.h | 26 --- include/configs/p1_p2_rdb_pc.h | 21 --- include/configs/socrates.h | 16 -- include/tsec.h | 60 ------ 17 files changed, 1 insertion(+), 710 deletions(-)
arch/arm/include/asm/arch-ls102xa/config.h +0 -5
@@ -36,11 +36,6 @@#define CFG_SYS_FSL_SEC_OFFSET 0x00700000#define CFG_SYS_FSL_JR0_OFFSET 0x00710000 -#define CFG_SYS_TSEC1_OFFSET 0x01d10000 -#define CFG_SYS_MDIO1_OFFSET 0x01d24000 - -#define TSEC_BASE_ADDR (CONFIG_SYS_IMMR + CFG_SYS_TSEC1_OFFSET) -#define MDIO_BASE_ADDR (CONFIG_SYS_IMMR + CFG_SYS_MDIO1_OFFSET)#define SCTR_BASE_ADDR (CONFIG_SYS_IMMR + 0x01b00000)
arch/powerpc/include/asm/config_mpc85xx.h +0 -17
@@ -24,18 +24,9 @@#elif defined(CONFIG_ARCH_P1010 )#define CONFIG_FSL_SDHC_V2_3 -#define CONFIG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 4 -/* P1011 is single core version of P1020 */ -#elif defined(CONFIG_ARCH_P1011 ) -#define CONFIG_TSECV2 - -#elif defined(CONFIG_ARCH_P1020 ) -#define CONFIG_TSECV2 -#elif defined(CONFIG_ARCH_P1021 ) -#define CONFIG_TSECV2 #define QE_MURAM_SIZE 0x6000UL#define MAX_QE_RISC 1#define QE_NUM_OF_SNUM 28
@@ -47,13 +38,8 @@#define CFG_SYS_BMAN_NUM_PORTALS 3#define CFG_SYS_FM_MURAM_SIZE 0x10000 -/* P1024 is lower end variant of P1020 */ -#elif defined(CONFIG_ARCH_P1024 ) -#define CONFIG_TSECV2 -/* P1025 is lower end variant of P1021 */ #elif defined(CONFIG_ARCH_P1025 ) -#define CONFIG_TSECV2 #define QE_MURAM_SIZE 0x6000UL#define MAX_QE_RISC 1#define QE_NUM_OF_SNUM 28
@@ -108,12 +94,10 @@#elif defined(CONFIG_ARCH_BSC9131 )#define CONFIG_FSL_SDHC_V2_3 -#define CONFIG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 3#elif defined(CONFIG_ARCH_BSC9132 )#define CONFIG_FSL_SDHC_V2_3 -#define CONFIG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 3#elif defined(CONFIG_ARCH_T4240 )
@@ -221,7 +205,6 @@#elif defined(CONFIG_ARCH_C29X )#define CONFIG_FSL_SDHC_V2_3 -#define CONFIG_TSECV2_1 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8#define CFG_SYS_FSL_SEC_IDX_OFFSET 0x20000
arch/powerpc/include/asm/immap_83xx.h +0 -5
@@ -873,9 +873,4 @@ struct ccsr_gpio {#define CFG_SYS_LBC_ADDR (&((immap_t *)CONFIG_SYS_IMMR)->im_lbc) -#define CFG_SYS_TSEC1_OFFSET 0x24000 -#define CFG_SYS_MDIO1_OFFSET 0x24000 - -#define TSEC_BASE_ADDR (CONFIG_SYS_IMMR + CFG_SYS_TSEC1_OFFSET) -#define MDIO_BASE_ADDR (CONFIG_SYS_IMMR + CFG_SYS_MDIO1_OFFSET)#endif /* __IMMAP_83xx__ */
arch/powerpc/include/asm/immap_85xx.h +0 -8
@@ -2541,13 +2541,6 @@ struct ccsr_pman {#define CFG_SYS_MPC85xx_USB2_OFFSET 0x23000#define CFG_SYS_MPC85xx_USB1_PHY_OFFSET 0xE5000#define CFG_SYS_MPC85xx_USB2_PHY_OFFSET 0xE5100 -#ifdef CONFIG_TSECV2 -#define CFG_SYS_TSEC1_OFFSET 0xB0000 -#elif defined(CONFIG_TSECV2_1 ) -#define CFG_SYS_TSEC1_OFFSET 0x10000 -#else -#define CFG_SYS_TSEC1_OFFSET 0x24000 -#endif #define CFG_SYS_MDIO1_OFFSET 0x24000#define CFG_SYS_MPC85xx_ESDHC_OFFSET 0x2e000#if defined(CONFIG_ARCH_C29X )
@@ -2673,7 +2666,6 @@ struct ccsr_pman {#define CFG_SYS_SEC_MON_ADDR \ (CONFIG_SYS_IMMR + CFG_SYS_SEC_MON_OFFSET) -#define TSEC_BASE_ADDR (CONFIG_SYS_IMMR + CFG_SYS_TSEC1_OFFSET)#define MDIO_BASE_ADDR (CONFIG_SYS_IMMR + CFG_SYS_MDIO1_OFFSET)#ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2
board/freescale/common/pixis.c +0 -73
79 lines not on this page · raw message
board/freescale/mpc8548cds/mpc8548cds.c +0 -82
85 lines not on this page · raw message
board/freescale/p1010rdb/p1010rdb.c +0 -43
49 lines not on this page · raw message
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +0 -50
56 lines not on this page · raw message
drivers/net/tsec.c +1 -198
281 lines not on this page · raw message
include/configs/MPC837XERDB.h +0 -27
@@ -41,8 +41,6 @@#ifdef CONFIG_VSC7385_ENET -#define CONFIG_TSEC2 -/* The flash address and size of the VSC7385 firmware image */ #define CONFIG_VSC7385_IMAGE 0xFE7FE000#define CONFIG_VSC7385_IMAGE_SIZE 8192
@@ -178,31 +176,6 @@#define CFG_SYS_PCIE2_MEM_PHYS 0xC8000000#define CFG_SYS_PCIE2_IO_PHYS 0xD8000000 -/* -* TSEC -*/ -#ifdef CONFIG_TSEC_ENET - -#define CONFIG_GMII /* MII PHY management */ - -#define CONFIG_TSEC1 - -#ifdef CONFIG_TSEC1 -#define CONFIG_TSEC1_NAME "TSEC0" -#define CFG_SYS_TSEC1_OFFSET 0x24000 -#define TSEC1_PHY_ADDR 2 -#define TSEC1_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#define TSEC1_PHYIDX 0 -#endif - -#ifdef CONFIG_TSEC2 -#define CONFIG_TSEC2_NAME "TSEC1" -#define TSEC2_PHY_ADDR 0x1c -#define TSEC2_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#define TSEC2_PHYIDX 0 -#endif -#endif -#ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC_PIN_MUX #define CFG_SYS_FSL_ESDHC_ADDR CFG_SYS_MPC83xx_ESDHC_ADDR
include/configs/MPC8548CDS.h +0 -27
@@ -283,33 +283,6 @@#endif #define CFG_SYS_SRIO1_MEM_SIZE 0x20000000/* 512M */ -#if defined(CONFIG_TSEC_ENET ) - -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC0" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC1" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC2" -#define CONFIG_TSEC4 -#define CONFIG_TSEC4_NAME "eTSEC3" -#undef CONFIG_MPC85XX_FEC - -#define TSEC1_PHY_ADDR 0 -#define TSEC2_PHY_ADDR 1 -#define TSEC3_PHY_ADDR 2 -#define TSEC4_PHY_ADDR 3 - -#define TSEC1_PHYIDX 0 -#define TSEC2_PHYIDX 0 -#define TSEC3_PHYIDX 0 -#define TSEC4_PHYIDX 0 -#define TSEC1_FLAGS TSEC_GIGABIT -#define TSEC2_FLAGS TSEC_GIGABIT -#define TSEC3_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#define TSEC4_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#endif /* CONFIG_TSEC_ENET */ -/* * Miscellaneous configurable options */
include/configs/P1010RDB.h +0 -31
@@ -349,37 +349,6 @@ extern unsigned long get_sdram_size(void);/* eSPI - Enhanced SPI */ #endif -#if defined(CONFIG_TSEC_ENET ) -#define CONFIG_MII_DEFAULT_TSEC 1/* Allow unregistered phys */ -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC3" - -#define TSEC1_PHY_ADDR 1 -#define TSEC2_PHY_ADDR 0 -#define TSEC3_PHY_ADDR 2 - -#define TSEC1_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#define TSEC2_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#define TSEC3_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) - -#define TSEC1_PHYIDX 0 -#define TSEC2_PHYIDX 0 -#define TSEC3_PHYIDX 0 - -/* TBI PHY configuration for SGMII mode */ -#define CONFIG_TSEC_TBICR_SETTINGS ( \ - TBICR_PHY_RESET \ - | TBICR_ANEG_ENABLE \ - | TBICR_FULL_DUPLEX \ - | TBICR_SPEED1_SET \ - ) - -#endif /* CONFIG_TSEC_ENET */ -#ifdef CONFIG_MMC #define CFG_SYS_FSL_ESDHC_ADDR CFG_SYS_MPC85xx_ESDHC_ADDR#endif
include/configs/ls1021aiot.h +0 -21
@@ -66,27 +66,6 @@/* SPI */ -/* -* eTSEC -*/ - -#ifdef CONFIG_TSEC_ENET -#define CONFIG_MII_DEFAULT_TSEC 1 -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC2" - -#define TSEC1_PHY_ADDR 1 -#define TSEC2_PHY_ADDR 3 - -#define TSEC1_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#define TSEC2_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) - -#define TSEC1_PHYIDX 0 -#define TSEC2_PHYIDX 0 -#endif -#define FSL_PCIE_COMPAT "fsl,ls1021a-pcie"#define CONFIG_PEN_ADDR_BIG_ENDIAN
include/configs/ls1021aqds.h +0 -26
@@ -247,32 +247,6 @@* MMC */ -/* -* eTSEC -*/ - -#ifdef CONFIG_TSEC_ENET -#define CONFIG_MII_DEFAULT_TSEC 3 -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC3" - -#define TSEC1_PHY_ADDR 1 -#define TSEC2_PHY_ADDR 2 -#define TSEC3_PHY_ADDR 3 - -#define TSEC1_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#define TSEC2_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#define TSEC3_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) - -#define TSEC1_PHYIDX 0 -#define TSEC2_PHYIDX 0 -#define TSEC3_PHYIDX 0 -#endif -#define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_SMP_PEN_ADDR 0x01ee0200
include/configs/p1_p2_rdb_pc.h +0 -21
@@ -366,27 +366,6 @@#endif #endif /* CONFIG_PCI */ -#if defined(CONFIG_TSEC_ENET ) -#define CONFIG_TSEC1 -#define CONFIG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 -#define CONFIG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 -#define CONFIG_TSEC3_NAME "eTSEC3" - -#define TSEC1_PHY_ADDR 2 -#define TSEC2_PHY_ADDR 0 -#define TSEC3_PHY_ADDR 1 - -#define TSEC1_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#define TSEC2_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#define TSEC3_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) - -#define TSEC1_PHYIDX 0 -#define TSEC2_PHYIDX 0 -#define TSEC3_PHYIDX 0 -#endif /* CONFIG_TSEC_ENET */ -/* * Environment */
include/configs/socrates.h +0 -16
@@ -111,22 +111,6 @@#define CFG_SYS_PCI1_MEM_PHYS 0x80000000#define CFG_SYS_PCI1_IO_PHYS 0xE2000000 -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "TSEC0" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "TSEC1" -#undef CONFIG_MPC85XX_FEC - -#define TSEC1_PHY_ADDR 0 -#define TSEC3_PHY_ADDR 1 - -#define TSEC1_PHYIDX 0 -#define TSEC3_PHYIDX 0 -#define TSEC1_FLAGS TSEC_GIGABIT -#define TSEC3_FLAGS TSEC_GIGABIT - -/* Options are: TSEC[0,1] */ -/* * Miscellaneous configurable options */
include/tsec.h +0 -60
77 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 10/41 net: fm: Remove non-DM_ETH code
In reply to Tom RiniAs DM_ETH is required for all network drivers, it's now safe to remove the non-DM_ETH support code.
--- drivers/net/fm/Makefile | 1 - drivers/net/fm/eth.c | 238 ----------------------- drivers/net/fm/fm.c | 4 - drivers/net/fm/fm.h | 8 - drivers/net/fm/init.c | 386 ------------------------------------- drivers/net/fm/memac_phy.c | 52 ----- 6 files changed, 689 deletions(-) delete mode 100644 drivers/net/fm/init.c
drivers/net/fm/Makefile +0 -1
@@ -6,7 +6,6 @@ obj-y += dtsec.o obj-y += eth.o obj-y += fdt.o obj-y += fm.o -obj-y += init.o obj-y += tgec.o obj-y += tgec_phy.o
drivers/net/fm/eth.c +0 -238
383 lines not on this page · raw message
drivers/net/fm/fm.c +0 -4
@@ -10,9 +10,7 @@#include <asm/io.h> #include <linux/errno.h> #include <u-boot/crc.h> -#ifdef CONFIG_DM_ETH #include <dm.h> -#endif #include "fm.h" #include <fsl_qe.h> /* For struct qe_firmware */
@@ -551,7 +549,6 @@ int fm_init_common(int index, struct ccsr_fman *reg) }#endif -#ifdef CONFIG_DM_ETH struct fman_priv {struct ccsr_fman *reg;unsigned int fman_id;
@@ -626,4 +623,3 @@ U_BOOT_DRIVER(fman) = { .priv_auto = sizeof(struct fman_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; -#endif /* CONFIG_DM_ETH */
drivers/net/fm/fm.h +0 -8
@@ -57,7 +57,6 @@ struct fm_port_bd {#define TxBD_READY 0x8000#define TxBD_LAST BD_LAST -#ifdef CONFIG_DM_ETHenum fm_mac_type {#ifdef CONFIG_SYS_FMAN_V3 FM_MEMAC ,
@@ -66,7 +65,6 @@ enum fm_mac_type { FM_TGEC,#endif }; -#endif /* Fman ethernet private struct */ /* Rx/Tx queue descriptor */
@@ -115,9 +113,7 @@ void fman_disable_port(enum fm_port port);void fman_enable_port (enum fm_port port);int fman_id (struct udevice *dev);void *fman_port (struct udevice *dev,int num); -#ifdef CONFIG_DM_ETH void *fman_mdio (struct udevice *dev,enum fm_mac_type type,int num); -#endif struct fsl_enet_mac {void *base;/* MAC controller registers base address */
@@ -143,13 +139,9 @@ struct fm_eth {struct mii_dev *bus;struct phy_device *phydev;int phyaddr; -#ifndef CONFIG_DM_ETH -struct eth_device *dev; -#else enum fm_mac_type mac_type;struct udevice *dev;struct udevice *pcs_mdio; -#endif int max_rx_len;struct fm_port_global_pram *rx_pram;/* Rx parameter table */ struct fm_port_global_pram *tx_pram;/* Tx parameter table */
drivers/net/fm/init.c deleted +0 -386
386 lines not on this page · raw message
drivers/net/fm/memac_phy.c +0 -52
96 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 11/41 net: dc2114x: Remove non-DM_ETH code
In reply to Tom RiniAs DM_ETH is required for all network drivers, it's now safe to remove the non-DM_ETH support code.
--- drivers/net/dc2114x.c | 156 ------------------------------------------ 1 file changed, 156 deletions(-)
drivers/net/dc2114x.c +0 -156
@@ -73,13 +73,7 @@#define POLL_DEMAND 1 -#if defined(CONFIG_DM_ETH )#define phys_to_bus (dev, a) dm_pci_phys_to_mem((dev), (a)) -#elif defined(CONFIG_E500 ) -#define phys_to_bus (dev, a) (a) -#else -#define phys_to_bus (dev, a) pci_phys_to_mem((dev), (a)) -#endif #define NUM_RX_DESC PKTBUFSRX#define NUM_TX_DESC 1/* Number of TX descriptors */
@@ -103,12 +97,7 @@ struct dc2114x_priv {int tx_new;/* TX descriptor ring pointer */ char rx_ring_size;char tx_ring_size; -#ifdef CONFIG_DM_ETH struct udevice *devno; -#else -struct eth_device dev; -pci_dev_t devno; -#endif char *name;void __iomem *iobase;u8 *enetaddr;
@@ -479,150 +468,6 @@ static struct pci_device_id supported[] = { { } }; -#ifndef CONFIG_DM_ETH -static int dc21x4x_init (struct eth_device *dev,struct bd_info *bis) -{ -struct dc2114x_priv *priv = - container_of(dev, struct dc2114x_priv, dev); - -/* Ensure we're not sleeping. */ -pci_write_config_byte (priv->devno,PCI_CFDA_PSM ,WAKEUP ); - -return dc21x4x_init_common (priv); -} - -static void dc21x4x_halt (struct eth_device *dev) -{ -struct dc2114x_priv *priv = - container_of(dev, struct dc2114x_priv, dev); - -dc21x4x_halt_common (priv); - -pci_write_config_byte (priv->devno,PCI_CFDA_PSM ,SLEEP ); -} - -static int dc21x4x_send (struct eth_device *dev,void *packet,int length) -{ -struct dc2114x_priv *priv = - container_of(dev, struct dc2114x_priv, dev); - -return dc21x4x_send_common (priv, packet, length); -} - -static int dc21x4x_recv (struct eth_device *dev) -{ -struct dc2114x_priv *priv = - container_of(dev, struct dc2114x_priv, dev); -int length =0 ; -int ret; - -while (true) { - ret =dc21x4x_recv_check (priv); -if (!ret) -break ; - -if (ret >0 ) { - length = ret; -/* Pass the packet up to the protocol layers */ -net_process_received_packet - (net_rx_packets[priv->rx_new], length -4 ); - } - -/* -* Change buffer ownership for this frame, -* back to the adapter. -*/ -if (ret != -EAGAIN ) - priv->rx_ring[priv->rx_new].status =cpu_to_le32 (R_OWN ); - -/* Update entry information. */ - priv->rx_new = (priv->rx_new +1 ) % priv->rx_ring_size; - } - -return length; -} - -int dc21x4x_initialize (struct bd_info *bis) -{ -struct dc2114x_priv *priv; -struct eth_device *dev; -unsigned short status; -unsigned char timer; -unsigned int iobase; -int card_number =0 ; -pci_dev_t devbusfn; -int idx =0 ; - -while (1 ) { - devbusfn =pci_find_devices (supported, idx++); -if (devbusfn ==-1 ) -break ; - -pci_read_config_word (devbusfn,PCI_COMMAND , &status); - status |=PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ; -pci_write_config_word (devbusfn,PCI_COMMAND , status); - -pci_read_config_word (devbusfn,PCI_COMMAND , &status); -if (!(status &PCI_COMMAND_MEMORY )) { -printf ("Error: Can not enable MEMORY access.\n" ); -continue ; - } - -if (!(status &PCI_COMMAND_MASTER )) { -printf ("Error: Can not enable Bus Mastering.\n" ); -continue ; - } - -/* Check the latency timer for values >= 0x60. */ -pci_read_config_byte (devbusfn,PCI_LATENCY_TIMER , &timer); - -if (timer <0x60 ) { -pci_write_config_byte (devbusfn,PCI_LATENCY_TIMER , -0x60 ); - } - -/* read BAR for memory space access */ -pci_read_config_dword (devbusfn,PCI_BASE_ADDRESS_1 , &iobase); - iobase &=PCI_BASE_ADDRESS_MEM_MASK ; -debug ("dc21x4x: DEC 21142 PCI Device @0x%x\n" , iobase); - - priv =memalign (32 ,sizeof (*priv)); -if (!priv) { -printf ("Can not allocalte memory of dc21x4x\n" ); -break ; - } -memset (priv,0 ,sizeof (*priv)); - - dev = &priv->dev; - -sprintf (dev->name,"dc21x4x#%d" , card_number); - priv->devno = devbusfn; - priv->name = dev->name; - priv->enetaddr = dev->enetaddr; - - dev->iobase =pci_mem_to_phys (devbusfn, iobase); - dev->priv = (void *)devbusfn; - dev->init = dc21x4x_init; - dev->halt = dc21x4x_halt; - dev->send = dc21x4x_send; - dev->recv = dc21x4x_recv; - -/* Ensure we're not sleeping. */ -pci_write_config_byte (devbusfn,PCI_CFDA_PSM ,WAKEUP ); - -udelay (10 *1000 ); - -read_hw_addr (priv); - -eth_register (dev); - - card_number++; - } - -return card_number; -} - -#else /* DM_ETH */ static int dc2114x_start (struct udevice *dev) {struct eth_pdata *plat =dev_get_plat (dev);
@@ -756,4 +601,3 @@ U_BOOT_DRIVER(eth_dc2114x) = { };U_BOOT_PCI_DEVICE (eth_dc2114x, supported); -#endif
Signature · 1 line
2.25.1
PATCH 12/41 net: designware: Remove non-DM_ETH code
In reply to Tom RiniAs DM_ETH is required for all network drivers, it's now safe to remove the non-DM_ETH support code.
--- drivers/net/designware.c | 112 ++------------------------------------- drivers/net/designware.h | 5 -- 2 files changed, 3 insertions(+), 114 deletions(-)
drivers/net/designware.c +3 -109
@@ -34,12 +34,8 @@static int dw_mdio_read (struct mii_dev *bus,int addr,int devad,int reg) { -#ifdef CONFIG_DM_ETH struct dw_eth_dev *priv =dev_get_priv ((struct udevice *)bus->priv);struct eth_mac_regs *mac_p = priv->mac_regs_p; -#else -struct eth_mac_regs *mac_p = bus->priv; -#endif ulong start;u16 miiaddr;int timeout =CONFIG_MDIO_TIMEOUT ;
@@ -62,12 +58,8 @@ static int dw_mdio_read(struct mii_dev *bus, int addr, int devad, int reg)static int dw_mdio_write (struct mii_dev *bus,int addr,int devad,int reg,u16 val) { -#ifdef CONFIG_DM_ETH struct dw_eth_dev *priv =dev_get_priv ((struct udevice *)bus->priv);struct eth_mac_regs *mac_p = priv->mac_regs_p; -#else -struct eth_mac_regs *mac_p = bus->priv; -#endif ulong start;u16 miiaddr;int ret = -ETIMEDOUT , timeout =CONFIG_MDIO_TIMEOUT ;
@@ -90,7 +82,7 @@ static int dw_mdio_write(struct mii_dev *bus, int addr, int devad, int reg,return ret; } -#if defined(CONFIG_DM_ETH ) &&CONFIG_IS_ENABLED (DM_GPIO ) +#if CONFIG_IS_ENABLED (DM_GPIO )static int __dw_mdio_reset (struct udevice *dev) {struct dw_eth_dev *priv =dev_get_priv (dev);
@@ -192,7 +184,7 @@ static int dw_mdio_init(const char *name, void *priv) bus->read = dw_mdio_read; bus->write = dw_mdio_write;snprintf (bus->name,sizeof (bus->name),"%s" , name); -#if defined(CONFIG_DM_ETH ) &&CONFIG_IS_ENABLED (DM_GPIO ) +#if CONFIG_IS_ENABLED (DM_GPIO ) bus->reset = dw_mdio_reset;#endif
@@ -575,7 +567,7 @@ static int dw_phy_init(struct dw_eth_dev *priv, void *dev)struct phy_device *phydev;int ret; -#if IS_ENABLED (CONFIG_DM_MDIO ) &&IS_ENABLED (CONFIG_DM_ETH ) +#if IS_ENABLED (CONFIG_DM_MDIO ) phydev =dm_eth_phy_connect (dev);if (!phydev)return -ENODEV ;
@@ -605,103 +597,6 @@ static int dw_phy_init(struct dw_eth_dev *priv, void *dev)return 0 ; } -#ifndef CONFIG_DM_ETH -static int dw_eth_init (struct eth_device *dev,struct bd_info *bis) -{ -int ret; - - ret =designware_eth_init (dev->priv, dev->enetaddr); -if (!ret) - ret =designware_eth_enable (dev->priv); - -return ret; -} - -static int dw_eth_send (struct eth_device *dev,void *packet,int length) -{ -return _dw_eth_send (dev->priv, packet, length); -} - -static int dw_eth_recv (struct eth_device *dev) -{ -uchar *packet; -int length; - - length =_dw_eth_recv (dev->priv, &packet); -if (length == -EAGAIN ) -return 0 ; -net_process_received_packet (packet, length); - -_dw_free_pkt (dev->priv); - -return 0 ; -} - -static void dw_eth_halt (struct eth_device *dev) -{ -return _dw_eth_halt (dev->priv); -} - -static int dw_write_hwaddr (struct eth_device *dev) -{ -return _dw_write_hwaddr (dev->priv, dev->enetaddr); -} - -int designware_initialize (ulong base_addr,u32 interface) -{ -struct eth_device *dev; -struct dw_eth_dev *priv; - - dev = (struct eth_device *)malloc (sizeof (struct eth_device )); -if (!dev) -return -ENOMEM ; - -/* -* Since the priv structure contains the descriptors which need a strict -* buswidth alignment, memalign is used to allocate memory -*/ - priv = (struct dw_eth_dev *)memalign (ARCH_DMA_MINALIGN , -sizeof (struct dw_eth_dev )); -if (!priv) { -free (dev); -return -ENOMEM ; - } - -if ((phys_addr_t )priv +sizeof (*priv) > (1ULL <<32 )) { -printf ("designware: buffers are outside DMA memory\n" ); -return -EINVAL ; - } - -memset (dev,0 ,sizeof (struct eth_device )); -memset (priv,0 ,sizeof (struct dw_eth_dev )); - -sprintf (dev->name,"dwmac.%lx" , base_addr); - dev->iobase = (int )base_addr; - dev->priv = priv; - - priv->dev = dev; - priv->mac_regs_p = (struct eth_mac_regs *)base_addr; - priv->dma_regs_p = (struct eth_dma_regs *)(base_addr + -DW_DMA_BASE_OFFSET ); - - dev->init = dw_eth_init; - dev->send = dw_eth_send; - dev->recv = dw_eth_recv; - dev->halt = dw_eth_halt; - dev->write_hwaddr = dw_write_hwaddr; - -eth_register (dev); - - priv->interface = interface; - -dw_mdio_init (dev->name, priv->mac_regs_p); - priv->bus =miiphy_get_dev_by_name (dev->name); - -return dw_phy_init (priv, dev); -} -#endif - -#ifdef CONFIG_DM_ETH static int designware_eth_start (struct udevice *dev) {struct eth_pdata *pdata =dev_get_plat (dev);
@@ -971,4 +866,3 @@ static struct pci_device_id supported[] = { };U_BOOT_PCI_DEVICE (eth_designware, supported); -#endif
drivers/net/designware.h +0 -5
@@ -233,9 +233,6 @@ struct dw_eth_dev {struct eth_mac_regs *mac_regs_p;struct eth_dma_regs *dma_regs_p; -#ifndef CONFIG_DM_ETH -struct eth_device *dev; -#endif #if CONFIG_IS_ENABLED (DM_GPIO )struct gpio_desc reset_gpio;#endif
@@ -248,7 +245,6 @@ struct dw_eth_dev {struct mii_dev *bus; }; -#ifdef CONFIG_DM_ETH int designware_eth_of_to_plat (struct udevice *dev);int designware_eth_probe (struct udevice *dev);extern const struct eth_ops designware_eth_ops;
@@ -266,6 +262,5 @@ int designware_eth_free_pkt(struct udevice *dev, uchar *packet, int length);void designware_eth_stop (struct udevice *dev);int designware_eth_write_hwaddr (struct udevice *dev); -#endif #endif
Signature · 1 line
2.25.1
PATCH 13/41 net: dm9000x: Remove non-DM_ETH code
In reply to Tom RiniAs DM_ETH is required for all network drivers, it's now safe to remove the non-DM_ETH support code.
--- drivers/net/dm9000x.c | 66 ------------------------------------------- 1 file changed, 66 deletions(-)
drivers/net/dm9000x.c +0 -66
@@ -75,9 +75,6 @@ struct dm9000_priv {void (*outblk)(struct dm9000_priv *db,void *data_ptr,int count);void (*inblk)(struct dm9000_priv *db,void *data_ptr,int count);void (*rx_status)(struct dm9000_priv *db,u16 *rxstatus,u16 *rxlen); -#ifndef CONFIG_DM_ETH -struct eth_device dev; -#endif void __iomem *base_io;void __iomem *base_data; };
@@ -572,68 +569,6 @@ static void dm9000_get_enetaddr(struct dm9000_priv *db, u8 *enetaddr)static void dm9000_get_enetaddr (struct dm9000_priv *db,u8 *enetaddr) {}#endif -#ifndef CONFIG_DM_ETH -static int dm9000_init (struct eth_device *dev,struct bd_info *bd) -{ - struct dm9000_priv *db = container_of(dev, struct dm9000_priv, dev); - -return dm9000_init_common (db, dev->enetaddr); -} - -static void dm9000_halt (struct eth_device *dev) -{ - struct dm9000_priv *db = container_of(dev, struct dm9000_priv, dev); - -dm9000_halt_common (db); -} - -static int dm9000_send (struct eth_device *dev,void *packet,int length) -{ - struct dm9000_priv *db = container_of(dev, struct dm9000_priv, dev); - -return dm9000_send_common (db, packet, length); -} - -static int dm9000_recv (struct eth_device *dev) -{ - struct dm9000_priv *db = container_of(dev, struct dm9000_priv, dev); -int ret; - - ret =dm9000_recv_common (db, net_rx_packets[0 ]); -if (ret >0 ) -net_process_received_packet (net_rx_packets[0 ], ret); - -return ret; -} - -int dm9000_initialize (struct bd_info *bis) -{ -struct dm9000_priv *priv; -struct eth_device *dev; - - priv =calloc (1 ,sizeof (*priv)); -if (!priv) -return -ENOMEM ; - - dev = &priv->dev; - - priv->base_io = (void __iomem *)DM9000_IO ; - priv->base_data = (void __iomem *)DM9000_DATA ; - -/* Load MAC address from EEPROM */ -dm9000_get_enetaddr (priv, dev->enetaddr); - - dev->init = dm9000_init; - dev->halt = dm9000_halt; - dev->send = dm9000_send; - dev->recv = dm9000_recv; -strcpy (dev->name,"dm9000" ); - -eth_register (&priv->dev); - -return 0 ; -} -#else /* ifdef CONFIG_DM_ETH */ static int dm9000_start (struct udevice *dev) {struct dm9000_priv *db =dev_get_priv (dev);
@@ -746,4 +681,3 @@ U_BOOT_DRIVER(dm9000) = { .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; -#endif
Signature · 1 line
2.25.1
PATCH 14/41 net: e1000: Remove non-DM_ETH code
In reply to Tom RiniAs DM_ETH is required for all network drivers, it's now safe to remove the non-DM_ETH support code.
--- drivers/net/e1000.c | 216 +------------------------------------------- drivers/net/e1000.h | 11 --- 2 files changed, 1 insertion(+), 226 deletions(-)
drivers/net/e1000.c +1 -215
@@ -65,9 +65,7 @@ DEFINE_ALIGN_BUFFER(unsigned char, packet, 4096, E1000_BUFFER_ALIGN);static int tx_tail;static int rx_tail, rx_last; -#ifdef CONFIG_DM_ETH static int num_cards;/* Number of E1000 devices seen so far */ -#endif static struct pci_device_id e1000_supported[] = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82542 ) },
@@ -1611,13 +1609,8 @@ e1000_reset_hw(struct e1000_hw *hw)/* For 82542 (rev 2.0), disable MWI before issuing a device reset */ if (hw->mac_type == e1000_82542_rev2_0) {DEBUGOUT ("Disabling MWI on 82542 rev 2.0\n" ); -#ifdef CONFIG_DM_ETH dm_pci_write_config16 (hw->pdev,PCI_COMMAND , hw->pci_cmd_word & ~PCI_COMMAND_INVALIDATE ); -#else -pci_write_config_word (hw->pdev,PCI_COMMAND , - hw->pci_cmd_word & ~PCI_COMMAND_INVALIDATE ); -#endif }/* Clear interrupt mask to stop board from generating interrupts */
@@ -1695,11 +1688,7 @@ e1000_reset_hw(struct e1000_hw *hw)/* If MWI was previously enabled, reenable it. */ if (hw->mac_type == e1000_82542_rev2_0) { -#ifdef CONFIG_DM_ETH dm_pci_write_config16 (hw->pdev,PCI_COMMAND , hw->pci_cmd_word); -#else -pci_write_config_word (hw->pdev,PCI_COMMAND , hw->pci_cmd_word); -#endif }if (hw->mac_type != e1000_igb)E1000_WRITE_REG (hw,PBA , pba);
@@ -1884,15 +1873,9 @@ e1000_init_hw(struct e1000_hw *hw, unsigned char enetaddr[6])/* For 82542 (rev 2.0), disable MWI and put the receiver into reset */ if (hw->mac_type == e1000_82542_rev2_0) {DEBUGOUT ("Disabling MWI on 82542 rev 2.0\n" ); -#ifdef CONFIG_DM_ETH dm_pci_write_config16 (hw->pdev,PCI_COMMAND , hw-> pci_cmd_word & ~PCI_COMMAND_INVALIDATE ); -#else -pci_write_config_word (hw->pdev,PCI_COMMAND , - hw-> - pci_cmd_word & ~PCI_COMMAND_INVALIDATE ); -#endif E1000_WRITE_REG (hw,RCTL ,E1000_RCTL_RST );E1000_WRITE_FLUSH (hw);mdelay (5 );
@@ -1908,11 +1891,7 @@ e1000_init_hw(struct e1000_hw *hw, unsigned char enetaddr[6])E1000_WRITE_REG (hw,RCTL ,0 );E1000_WRITE_FLUSH (hw);mdelay (1 ); -#ifdef CONFIG_DM_ETH dm_pci_write_config16 (hw->pdev,PCI_COMMAND , hw->pci_cmd_word); -#else -pci_write_config_word (hw->pdev,PCI_COMMAND , hw->pci_cmd_word); -#endif }/* Zero out the Multicast HASH table */
@@ -1935,17 +1914,10 @@ e1000_init_hw(struct e1000_hw *hw, unsigned char enetaddr[6])default :/* Workaround for PCI-X problem when BIOS sets MMRBC incorrectly. */ if (hw->bus_type == e1000_bus_type_pcix) { -#ifdef CONFIG_DM_ETH dm_pci_read_config16 (hw->pdev,PCIX_COMMAND_REGISTER , &pcix_cmd_word);dm_pci_read_config16 (hw->pdev,PCIX_STATUS_REGISTER_HI , &pcix_stat_hi_word); -#else -pci_read_config_word (hw->pdev,PCIX_COMMAND_REGISTER , - &pcix_cmd_word); -pci_read_config_word (hw->pdev,PCIX_STATUS_REGISTER_HI , - &pcix_stat_hi_word); -#endif cmd_mmrbc = (pcix_cmd_word &PCIX_COMMAND_MMRBC_MASK ) >>PCIX_COMMAND_MMRBC_SHIFT ;
@@ -1957,13 +1929,8 @@ e1000_init_hw(struct e1000_hw *hw, unsigned char enetaddr[6])if (cmd_mmrbc > stat_mmrbc) { pcix_cmd_word &= ~PCIX_COMMAND_MMRBC_MASK ; pcix_cmd_word |= stat_mmrbc <<PCIX_COMMAND_MMRBC_SHIFT ; -#ifdef CONFIG_DM_ETH dm_pci_write_config16 (hw->pdev,PCIX_COMMAND_REGISTER , pcix_cmd_word); -#else -pci_write_config_word (hw->pdev,PCIX_COMMAND_REGISTER , - pcix_cmd_word); -#endif } }break ;
@@ -5060,7 +5027,6 @@ e1000_sw_init(struct e1000_hw *hw)int result;/* PCI config space info */ -#ifdef CONFIG_DM_ETH dm_pci_read_config16 (hw->pdev,PCI_VENDOR_ID , &hw->vendor_id);dm_pci_read_config16 (hw->pdev,PCI_DEVICE_ID , &hw->device_id); dm_pci_read_config16(hw->pdev, PCI_SUBSYSTEM_VENDOR_ID,
@@ -5069,16 +5035,6 @@ e1000_sw_init(struct e1000_hw *hw)dm_pci_read_config8 (hw->pdev,PCI_REVISION_ID , &hw->revision_id);dm_pci_read_config16 (hw->pdev,PCI_COMMAND , &hw->pci_cmd_word); -#else -pci_read_config_word (hw->pdev,PCI_VENDOR_ID , &hw->vendor_id); -pci_read_config_word (hw->pdev,PCI_DEVICE_ID , &hw->device_id); -pci_read_config_word (hw->pdev,PCI_SUBSYSTEM_VENDOR_ID , - &hw->subsystem_vendor_id); -pci_read_config_word (hw->pdev,PCI_SUBSYSTEM_ID , &hw->subsystem_id); - -pci_read_config_byte (hw->pdev,PCI_REVISION_ID , &hw->revision_id); -pci_read_config_word (hw->pdev,PCI_COMMAND , &hw->pci_cmd_word); -#endif /* identify the MAC */ result =e1000_set_mac_type (hw);
@@ -5485,51 +5441,25 @@ void e1000_get_bus_type(struct e1000_hw *hw) } } -#ifndef CONFIG_DM_ETH -/* A list of all registered e1000 devices */ -static LIST_HEAD (e1000_hw_list); -#endif - -#ifdef CONFIG_DM_ETH static int e1000_init_one (struct e1000_hw *hw,int cardnum,struct udevice *devno,unsigned char enetaddr[6 ]) -#else -static int e1000_init_one (struct e1000_hw *hw,int cardnum,pci_dev_t devno, - unsigned char enetaddr[6]) -#endif {u32 val;/* Assign the passed-in values */ -#ifdef CONFIG_DM_ETH - hw->pdev = devno; -#else hw->pdev = devno; -#endif hw->cardnum = cardnum;/* Print a debug message with the IO base address */ -#ifdef CONFIG_DM_ETH dm_pci_read_config32 (devno,PCI_BASE_ADDRESS_0 , &val); -#else -pci_read_config_dword (devno,PCI_BASE_ADDRESS_0 , &val); -#endif E1000_DBG (hw,"iobase 0x%08x\n" , val &0xfffffff0 );/* Try to enable I/O accesses and bus-mastering */ val =PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ; -#ifdef CONFIG_DM_ETH dm_pci_write_config32 (devno,PCI_COMMAND , val); -#else -pci_write_config_dword (devno,PCI_COMMAND , val); -#endif /* Make sure it worked */ -#ifdef CONFIG_DM_ETH dm_pci_read_config32 (devno,PCI_COMMAND , &val); -#else -pci_read_config_dword (devno,PCI_COMMAND , &val); -#endif if (!(val &PCI_COMMAND_MEMORY )) {E1000_ERR (hw,"Can't enable I/O memory\n" );return -ENOSPC ;
@@ -5548,13 +5478,8 @@ static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno,#ifndef CONFIG_E1000_NO_NVM hw->eeprom_semaphore_present = true;#endif -#ifdef CONFIG_DM_ETH hw->hw_addr =dm_pci_map_bar (devno,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM ); -#else - hw->hw_addr =pci_map_bar (devno,PCI_BASE_ADDRESS_0 , -PCI_REGION_MEM ); -#endif hw->mac_type = e1000_undefined;/* MAC and Phy settings */
@@ -5599,71 +5524,13 @@ static void e1000_name(char *str, int cardnum)sprintf (str,"e1000#%u" , cardnum); } -#ifndef CONFIG_DM_ETH -/************************************************************************** -TRANSMIT - Transmit a frame -***************************************************************************/ -static int e1000_transmit (struct eth_device *nic,void *txpacket,int length) -{ -struct e1000_hw *hw = nic->priv; - -return _e1000_transmit (hw, txpacket, length); -} - -/************************************************************************** -DISABLE - Turn off ethernet interface -***************************************************************************/ -static void -e1000_disable (struct eth_device *nic) -{ -struct e1000_hw *hw = nic->priv; - -_e1000_disable (hw); -} - -/************************************************************************** -INIT - set up ethernet interface(s) -***************************************************************************/ -static int -e1000_init (struct eth_device *nic,struct bd_info *bis) -{ -struct e1000_hw *hw = nic->priv; - -return _e1000_init (hw, nic->enetaddr); -} - -static int -e1000_poll (struct eth_device *nic) -{ -struct e1000_hw *hw = nic->priv; -int len; - - len =_e1000_poll (hw); -if (len) { -net_process_received_packet ((uchar *)packet, len); -fill_rx (hw); - } - -return len ?1 :0 ; -} -#endif /* !CONFIG_DM_ETH */ - -#ifdef CONFIG_DM_ETH static int e1000_write_hwaddr (struct udevice *dev) -#else -static int e1000_write_hwaddr(struct eth_device *dev) -#endif {#ifndef CONFIG_E1000_NO_NVM unsigned char current_mac[6 ]; -#ifdef CONFIG_DM_ETH struct eth_pdata *plat =dev_get_plat (dev);struct e1000_hw *hw =dev_get_priv (dev);u8 *mac = plat->enetaddr; -#else -struct e1000_hw *hw = dev->priv; -u8 *mac = dev->enetaddr; -#endif uint16_t data[3 ];int ret_val, i;
@@ -5701,87 +5568,16 @@ static int e1000_write_hwaddr(struct eth_device *dev)#endif } -#ifndef CONFIG_DM_ETH -/************************************************************************** -PROBE - Look for an adapter, this routine's visible to the outside -You should omit the last argument struct pci_device * for a non-PCI NIC -***************************************************************************/ -int -e1000_initialize (struct bd_info * bis) -{ -unsigned int i; -pci_dev_t devno; -int ret; - -DEBUGFUNC (); - -/* Find and probe all the matching PCI devices */ -for (i =0 ; (devno =pci_find_devices (e1000_supported, i)) >=0 ; i++) { -/* -* These will never get freed due to errors, this allows us to -* perform SPI EEPROM programming from U-Boot, for example. -*/ -struct eth_device *nic =malloc (sizeof (*nic)); -struct e1000_hw *hw =malloc (sizeof (*hw)); -if (!nic || !hw) { -printf ("e1000#%u: Out of Memory!\n" , i); -free (nic); -free (hw); -continue ; - } - -/* Make sure all of the fields are initially zeroed */ -memset (nic,0 ,sizeof (*nic)); -memset (hw,0 ,sizeof (*hw)); - nic->priv = hw; - -/* Generate a card name */ -e1000_name (nic->name, i); - hw->name = nic->name; - - ret =e1000_init_one (hw, i, devno, nic->enetaddr); -if (ret) -continue ; -list_add_tail (&hw->list_node, &e1000_hw_list); - - hw->nic = nic; - -/* Set up the function pointers and register the device */ - nic->init = e1000_init; - nic->recv = e1000_poll; - nic->send = e1000_transmit; - nic->halt = e1000_disable; - nic->write_hwaddr = e1000_write_hwaddr; -eth_register (nic); - } - -return i; -} - -struct e1000_hw *e1000_find_card (unsigned int cardnum) -{ -struct e1000_hw *hw; - -list_for_each_entry (hw, &e1000_hw_list, list_node) -if (hw->cardnum == cardnum) -return hw; - -return NULL ; -} -#endif /* !CONFIG_DM_ETH */ -#ifdef CONFIG_CMD_E1000 static int do_e1000 (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {unsigned char *mac =NULL ; -#ifdef CONFIG_DM_ETH struct eth_pdata *plat;struct udevice *dev;char name[30 ];int ret; -#endif -#if !defined(CONFIG_DM_ETH ) || defined(CONFIG_E1000_SPI ) +#if defined(CONFIG_E1000_SPI )struct e1000_hw *hw;#endif int cardnum;
@@ -5793,18 +5589,12 @@ static int do_e1000(struct cmd_tbl *cmdtp, int flag, int argc,/* Make sure we can find the requested e1000 card */ cardnum =dectoul (argv[1 ],NULL ); -#ifdef CONFIG_DM_ETH e1000_name (name, cardnum); ret =uclass_get_device_by_name (UCLASS_ETH , name, &dev);if (!ret) { plat =dev_get_plat (dev); mac = plat->enetaddr; } -#else - hw =e1000_find_card (cardnum); -if (hw) - mac = hw->nic->enetaddr; -#endif if (!mac) {printf ("e1000: ERROR: No such device: e1000#%s\n" , argv[1 ]);return 1 ;
@@ -5817,9 +5607,7 @@ static int do_e1000(struct cmd_tbl *cmdtp, int flag, int argc, }#ifdef CONFIG_E1000_SPI -#ifdef CONFIG_DM_ETH hw =dev_get_priv (dev); -#endif /* Handle the "SPI" subcommand */ if (!strcmp (argv[2 ],"spi" ))return do_e1000_spi (cmdtp, hw, argc -3 , argv +3 );
@@ -5843,7 +5631,6 @@ U_BOOT_CMD( );#endif /* not CONFIG_CMD_E1000 */ -#ifdef CONFIG_DM_ETH static int e1000_eth_start (struct udevice *dev) {struct eth_pdata *plat =dev_get_plat (dev);
@@ -5948,4 +5735,3 @@ U_BOOT_DRIVER(eth_e1000) = { };U_BOOT_PCI_DEVICE (eth_e1000, e1000_supported); -#endif
drivers/net/e1000.h +0 -11
@@ -21,10 +21,6 @@#include <linux/list.h> #include <malloc.h> #include <net.h> -/* Avoids a compile error since struct eth_device is not defined */ -#ifndef CONFIG_DM_ETH -#include <netdev.h> -#endif #include <asm/io.h> #include <pci.h>
@@ -1077,19 +1073,12 @@ typedef enum {struct e1000_hw {const char *name;struct list_head list_node; -#ifndef CONFIG_DM_ETH -struct eth_device *nic; -#endif #ifdef CONFIG_E1000_SPI struct spi_slave spi;#endif unsigned int cardnum; -#ifdef CONFIG_DM_ETH struct udevice *pdev; -#else -pci_dev_t pdev; -#endif uint8_t *hw_addr;e1000_mac_type mac_type;e1000_phy_type phy_type;
Signature · 1 line
2.25.1
PATCH 15/41 net: eepro100: Remove non-DM_ETH code
In reply to Tom RiniAs DM_ETH is required for all network drivers, it's now safe to remove the non-DM_ETH support code.
--- drivers/net/eepro100.c | 134 ----------------------------------------- 1 file changed, 134 deletions(-)
drivers/net/eepro100.c +0 -134
@@ -206,27 +206,14 @@ struct eepro100_priv {/* TX descriptor ring pointer */ int tx_next;int tx_threshold; -#ifdef CONFIG_DM_ETH struct udevice *devno; -#else -struct eth_device dev; -pci_dev_t devno; -#endif char *name;void __iomem *iobase;u8 *enetaddr; }; -#if defined(CONFIG_DM_ETH )#define bus_to_phys (dev, a) dm_pci_mem_to_phys((dev), (a))#define phys_to_bus (dev, a) dm_pci_phys_to_mem((dev), (a)) -#elif defined(CONFIG_E500 ) -#define bus_to_phys (dev, a) (a) -#define phys_to_bus (dev, a) (a) -#else -#define bus_to_phys (dev, a) pci_mem_to_phys((dev), (a)) -#define phys_to_bus (dev, a) pci_phys_to_mem((dev), (a)) -#endif static int INW (struct eepro100_priv *priv,u_long addr) {
@@ -778,126 +765,6 @@ done:return ; } -#ifndef CONFIG_DM_ETH -static int eepro100_init (struct eth_device *dev,struct bd_info *bis) -{ -struct eepro100_priv *priv = - container_of(dev, struct eepro100_priv, dev); - -return eepro100_init_common (priv); -} - -static void eepro100_halt (struct eth_device *dev) -{ -struct eepro100_priv *priv = - container_of(dev, struct eepro100_priv, dev); - -eepro100_halt_common (priv); -} - -static int eepro100_send (struct eth_device *dev,void *packet,int length) -{ -struct eepro100_priv *priv = - container_of(dev, struct eepro100_priv, dev); - -return eepro100_send_common (priv, packet, length); -} - -static int eepro100_recv (struct eth_device *dev) -{ -struct eepro100_priv *priv = - container_of(dev, struct eepro100_priv, dev); -uchar *packet; -int ret; - - ret =eepro100_recv_common (priv, &packet); -if (ret >0 ) -net_process_received_packet (packet, ret); -if (ret) -eepro100_free_pkt_common (priv); - -return ret; -} - -int eepro100_initialize (struct bd_info *bis) -{ -struct eepro100_priv *priv; -struct eth_device *dev; -int card_number =0 ; -u32 iobase, status; -pci_dev_t devno; -int idx =0 ; -int ret; - -while (1 ) { -/* Find PCI device */ - devno =pci_find_devices (supported, idx++); -if (devno <0 ) -break ; - -pci_read_config_dword (devno,PCI_BASE_ADDRESS_0 , &iobase); - iobase &= ~0xf ; - -debug ("eepro100: Intel i82559 PCI EtherExpressPro @0x%x\n" , - iobase); - -pci_write_config_dword (devno,PCI_COMMAND , -PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ); - -/* Check if I/O accesses and Bus Mastering are enabled. */ -pci_read_config_dword (devno,PCI_COMMAND , &status); -if (!(status &PCI_COMMAND_MEMORY )) { -printf ("Error: Can not enable MEM access.\n" ); -continue ; - } - -if (!(status &PCI_COMMAND_MASTER )) { -printf ("Error: Can not enable Bus Mastering.\n" ); -continue ; - } - - priv =calloc (1 ,sizeof (*priv)); -if (!priv) { -printf ("eepro100: Can not allocate memory\n" ); -break ; - } - dev = &priv->dev; - -sprintf (dev->name,"i82559#%d" , card_number); - priv->name = dev->name; -/* this have to come before bus_to_phys() */ - priv->devno = devno; - priv->iobase = (void __iomem *)bus_to_phys (devno, iobase); - priv->enetaddr = dev->enetaddr; - - dev->init = eepro100_init; - dev->halt = eepro100_halt; - dev->send = eepro100_send; - dev->recv = eepro100_recv; - -eth_register (dev); - - ret =eepro100_initialize_mii (priv); -if (ret) { -eth_unregister (dev); -free (priv); -return ret; - } - - card_number++; - -/* Set the latency timer for value. */ -pci_write_config_byte (devno,PCI_LATENCY_TIMER ,0x20 ); - -udelay (10 *1000 ); - -eepro100_get_hwaddr (priv); - } - -return card_number; -} - -#else /* DM_ETH */ static int eepro100_start (struct udevice *dev) {struct eth_pdata *plat =dev_get_plat (dev);
@@ -1014,4 +881,3 @@ U_BOOT_DRIVER(eth_eepro100) = { };U_BOOT_PCI_DEVICE (eth_eepro100, supported); -#endif
Signature · 1 line
2.25.1
PATCH 16/41 net: ethoc: Remove non-DM_ETH code
In reply to Tom RiniAs DM_ETH is required for all network drivers, it's now safe to remove the non-DM_ETH support code.
--- drivers/net/ethoc.c | 85 ---------------------------- include/dm/platform_data/net_ethoc.h | 4 -- 2 files changed, 89 deletions(-)
drivers/net/ethoc.c +0 -85
@@ -643,8 +643,6 @@ static inline int ethoc_phy_init(struct ethoc *priv, void *dev)#endif -#ifdef CONFIG_DM_ETH -static int ethoc_write_hwaddr (struct udevice *dev) {struct ethoc_eth_pdata *pdata =dev_get_plat (dev);
@@ -753,86 +751,3 @@ U_BOOT_DRIVER(ethoc) = { .priv_auto = sizeof(struct ethoc), .plat_auto = sizeof(struct ethoc_eth_pdata), }; - -#else - -static int ethoc_init (struct eth_device *dev,struct bd_info *bd) -{ -struct ethoc *priv = (struct ethoc *)dev->priv; - -return ethoc_init_common (priv); -} - -static int ethoc_write_hwaddr (struct eth_device *dev) -{ -struct ethoc *priv = (struct ethoc *)dev->priv; -u8 *mac = dev->enetaddr; - -return ethoc_write_hwaddr_common (priv, mac); -} - -static int ethoc_send (struct eth_device *dev,void *packet,int length) -{ -return ethoc_send_common (dev->priv, packet, length); -} - -static void ethoc_halt (struct eth_device *dev) -{ -ethoc_disable_rx_and_tx (dev->priv); -} - -static int ethoc_recv (struct eth_device *dev) -{ -struct ethoc *priv = (struct ethoc *)dev->priv; -int count; - -if (!ethoc_is_new_packet_received (priv)) -return 0 ; - -for (count =0 ; count <PKTBUFSRX ; ++count) { -uchar *packetp; -int size =ethoc_rx_common (priv, &packetp); - -if (size <0 ) -break ; -if (size >0 ) -net_process_received_packet (packetp, size); -ethoc_free_pkt_common (priv); - } -return 0 ; -} - -int ethoc_initialize (u8 dev_num,int base_addr) -{ -struct ethoc *priv; -struct eth_device *dev; - - priv =malloc (sizeof (*priv)); -if (!priv) -return 0 ; - dev =malloc (sizeof (*dev)); -if (!dev) { -free (priv); -return 0 ; - } - -memset (dev,0 ,sizeof (*dev)); - dev->priv = priv; - dev->iobase = base_addr; - dev->init = ethoc_init; - dev->halt = ethoc_halt; - dev->send = ethoc_send; - dev->recv = ethoc_recv; - dev->write_hwaddr = ethoc_write_hwaddr; -sprintf (dev->name,"%s-%hu" ,"ETHOC" , dev_num); - priv->iobase =ioremap (dev->iobase,ETHOC_IOSIZE ); - -eth_register (dev); - -ethoc_mdio_init (dev->name, priv); -ethoc_phy_init (priv, dev); - -return 1 ; -} - -#endif
include/dm/platform_data/net_ethoc.h +0 -4
@@ -8,13 +8,9 @@#include <net.h> -#ifdef CONFIG_DM_ETH -struct ethoc_eth_pdata {struct eth_pdata eth_pdata;phys_addr_t packet_base; }; -#endif -#endif /* _ETHOC_H */
Signature · 1 line
2.25.1
PATCH 17/41 net: fec_mxc: Remove non-DM_ETH code
In reply to Tom RiniAs DM_ETH is required for all network drivers, it's now safe to remove the non-DM_ETH support code.
--- drivers/net/fec_mxc.h | 2 -- 1 file changed, 2 deletions(-)
drivers/net/fec_mxc.h +0 -2
@@ -263,9 +263,7 @@ struct fec_priv {uint32_t reset_delay;uint32_t reset_post_delay;#endif -#ifdef CONFIG_DM_ETH u32 interface; -#endif struct clk ipg_clk;struct clk ahb_clk;struct clk clk_enet_out;
Signature · 1 line
2.25.1
PATCH 18/41 net: fsl-mc: Remove non-DM_ETH code
In reply to Tom RiniAs DM_ETH is required for all network drivers, it's now safe to remove the non-DM_ETH support code.
--- drivers/net/fsl-mc/mc.c | 21 --------------------- 1 file changed, 21 deletions(-)
drivers/net/fsl-mc/mc.c +0 -21
@@ -165,21 +165,12 @@ enum mc_fixup_type { };static int mc_fixup_mac_addr (void *blob,int nodeoffset, -#ifdef CONFIG_DM_ETHconst char *propname,struct udevice *eth_dev, -#else -const char *propname,struct eth_device *eth_dev, -#endifenum mc_fixup_type type) { -#ifdef CONFIG_DM_ETH struct eth_pdata *plat =dev_get_plat (eth_dev);unsigned char *enetaddr = plat->enetaddr;int eth_index =dev_seq (eth_dev); -#else -unsigned char *enetaddr = eth_dev->enetaddr; -int eth_index = eth_dev->index; -#endif int err =0 , len =0 , size, i;unsigned char env_enetaddr[ARP_HLEN ];unsigned int enetaddr_32[ARP_HLEN ];
@@ -252,11 +243,7 @@ const char *dpl_get_connection_endpoint(void *blob, char *endpoint) }static int mc_fixup_dpl_mac_addr (void *blob,int dpmac_id, -#ifdef CONFIG_DM_ETHstruct udevice *eth_dev) -#else - struct eth_device *eth_dev) -#endif {int objoff =fdt_path_offset (blob,"/objects" );int dpmacoff =-1 , dpnioff =-1 ;
@@ -355,11 +342,7 @@ void fdt_fsl_mc_fixup_iommu_map_entry(void *blob) }static int mc_fixup_dpc_mac_addr (void *blob,int dpmac_id, -#ifdef CONFIG_DM_ETHstruct udevice *eth_dev) -#else - struct eth_device *eth_dev) -#endif {int nodeoffset =fdt_path_offset (blob,"/board_info/ports" ), noff;int err =0 ;
@@ -402,12 +385,8 @@ static int mc_fixup_dpc_mac_addr(void *blob, int dpmac_id,static int mc_fixup_mac_addrs (void *blob,enum mc_fixup_type type) {int i, err =0 , ret =0 ; -#ifdef CONFIG_DM_ETH #define ETH_NAME_LEN 20struct udevice *eth_dev; -#else -struct eth_device *eth_dev; -#endif char ethname[ETH_NAME_LEN ];for (i =WRIOP1_DPMAC1 ; i <NUM_WRIOP_PORTS ; i++) {
Signature · 1 line
2.25.1
PATCH 19/41 net: ldpaa_eth: Remove non-DM_ETH code
In reply to Tom RiniAs DM_ETH is required for all network drivers, it's now safe to remove the non-DM_ETH support code.
--- drivers/net/ldpaa_eth/ldpaa_eth.c | 198 +----------------------------- drivers/net/ldpaa_eth/ldpaa_eth.h | 4 - 2 files changed, 2 insertions(+), 200 deletions(-)
drivers/net/ldpaa_eth/ldpaa_eth.c +2 -196
@@ -24,7 +24,6 @@#include "ldpaa_eth.h" #ifdef CONFIG_PHYLIB -#ifdef CONFIG_DM_ETHstatic void init_phy (struct udevice *dev) {struct ldpaa_eth_priv *priv =dev_get_priv (dev);
@@ -36,51 +35,6 @@ static void init_phy(struct udevice *dev) phy_config(priv->phy); } -#else -static int init_phy (struct eth_device *dev) -{ -struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)dev->priv; -struct phy_device *phydev =NULL ; -struct mii_dev *bus; -int phy_addr, phy_num; -int ret =0 ; - - bus =wriop_get_mdio (priv->dpmac_id); -if (bus ==NULL ) -return 0 ; - -for (phy_num =0 ; phy_num <WRIOP_MAX_PHY_NUM ; phy_num++) { - phy_addr =wriop_get_phy_address (priv->dpmac_id, phy_num); -if (phy_addr <0 ) -continue ; - - phydev =phy_connect (bus, phy_addr, dev, -wriop_get_enet_if (priv->dpmac_id)); -if (!phydev) { -printf ("Failed to connect\n" ); - ret = -ENODEV ; -break ; - } -wriop_set_phy_dev (priv->dpmac_id, phy_num, phydev); - ret =phy_config (phydev); -if (ret) -break ; - } - -if (ret) { -for (phy_num =0 ; phy_num <WRIOP_MAX_PHY_NUM ; phy_num++) { - phydev =wriop_get_phy_dev (priv->dpmac_id, phy_num); -if (!phydev) -continue ; - -free (phydev); -wriop_set_phy_dev (priv->dpmac_id, phy_num,NULL ); - } - } - -return ret; -} -#endif #endif #ifdef DEBUG
@@ -147,15 +101,9 @@ static void ldpaa_eth_get_dpni_counter(void) } } -#ifdef CONFIG_DM_ETH static void ldpaa_eth_get_dpmac_counter (struct udevice *dev) {struct ldpaa_eth_priv *priv =dev_get_priv (dev); -#else -static void ldpaa_eth_get_dpmac_counter (struct eth_device *net_dev) -{ -struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)net_dev->priv; -#endif int err =0 ;u64 value;
@@ -288,16 +236,10 @@ error:return ; } -#ifdef CONFIG_DM_ETH static int ldpaa_eth_pull_dequeue_rx (struct udevice *dev,int flags,uchar **packetp) {struct ldpaa_eth_priv *priv =dev_get_priv (dev); -#else -static int ldpaa_eth_pull_dequeue_rx (struct eth_device *dev) -{ -struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)dev->priv; -#endif const struct ldpaa_dq *dq;const struct dpaa_fd *fd;int i =5 , err =0 , status;
@@ -354,15 +296,9 @@ static int ldpaa_eth_pull_dequeue_rx(struct eth_device *dev)return err; } -#ifdef CONFIG_DM_ETH static int ldpaa_eth_tx (struct udevice *dev,void *buf,int len) {struct ldpaa_eth_priv *priv =dev_get_priv (dev); -#else -static int ldpaa_eth_tx (struct eth_device *net_dev,void *buf,int len) -{ -struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)net_dev->priv; -#endif struct dpaa_fd fd;u64 buffer_start;int data_offset, err;
@@ -438,27 +374,6 @@ error:return err; } -static struct phy_device *ldpaa_get_phydev (struct ldpaa_eth_priv *priv) -{ -#ifdef CONFIG_DM_ETH -return priv->phy; -#else -#ifdef CONFIG_PHYLIB -struct phy_device *phydev =NULL ; -int phy_num; - -/* start the phy devices one by one and update the dpmac state */ -for (phy_num =0 ; phy_num <WRIOP_MAX_PHY_NUM ; phy_num++) { - phydev =wriop_get_phy_dev (priv->dpmac_id, phy_num); -if (phydev) -return phydev; - } -return NULL ; -#endif -return NULL ; -#endif -} -static int ldpaa_get_dpmac_state (struct ldpaa_eth_priv *priv,struct dpmac_link_state *state) {
@@ -479,7 +394,7 @@ static int ldpaa_get_dpmac_state(struct ldpaa_eth_priv *priv, state->up =1 ; state->options |=DPMAC_LINK_OPT_AUTONEG ; - phydev =ldpaa_get_phydev (priv); + phydev = priv->phy;if (phydev) { err =phy_startup (phydev);
@@ -509,16 +424,10 @@ static int ldpaa_get_dpmac_state(struct ldpaa_eth_priv *priv,return 0 ; } -#ifdef CONFIG_DM_ETH static int ldpaa_eth_open (struct udevice *dev) {struct eth_pdata *plat =dev_get_plat (dev);struct ldpaa_eth_priv *priv =dev_get_priv (dev); -#else -static int ldpaa_eth_open (struct eth_device *net_dev,struct bd_info *bd) -{ -struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)net_dev->priv; -#endif struct dpmac_link_state dpmac_link_state = {0 };#ifdef DEBUG struct dpni_link_state link_state;
@@ -526,13 +435,8 @@ static int ldpaa_eth_open(struct eth_device *net_dev, struct bd_info *bd)int err =0 ;struct dpni_queue d_queue; -#ifdef CONFIG_DM_ETH if (eth_is_active (dev))return 0 ; -#else -if (net_dev->state ==ETH_STATE_ACTIVE ) -return 0 ; -#endif if (get_mc_boot_status () !=0 ) {printf ("ERROR (MC is not booted)\n" );
@@ -572,13 +476,8 @@ static int ldpaa_eth_open(struct eth_device *net_dev, struct bd_info *bd)if (err) goto err_dpni_bind; -#ifdef CONFIG_DM_ETH err =dpni_add_mac_addr (dflt_mc_io,MC_CMD_NO_FLAGS , dflt_dpni->dpni_handle, plat->enetaddr); -#else - err =dpni_add_mac_addr (dflt_mc_io,MC_CMD_NO_FLAGS , - dflt_dpni->dpni_handle, net_dev->enetaddr); -#endif if (err) {printf ("dpni_add_mac_addr() failed\n" );return err;
@@ -651,34 +550,18 @@ err_dpmac_setup:return err; } -#ifdef CONFIG_DM_ETH static void ldpaa_eth_stop (struct udevice *dev) {struct ldpaa_eth_priv *priv =dev_get_priv (dev); -#else -static void ldpaa_eth_stop (struct eth_device *net_dev) -{ -struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)net_dev->priv; -#endif struct phy_device *phydev =NULL ;int err =0 ; -#ifdef CONFIG_DM_ETH if (!eth_is_active (dev))return ; -#else -if ((net_dev->state ==ETH_STATE_PASSIVE ) || - (net_dev->state ==ETH_STATE_INIT )) -return ; -#endif #ifdef DEBUG ldpaa_eth_get_dpni_counter (); -#ifdef CONFIG_DM_ETH ldpaa_eth_get_dpmac_counter (dev); -#else -ldpaa_eth_get_dpmac_counter (net_dev); -#endif #endif err = dprc_disconnect(dflt_mc_io, MC_CMD_NO_FLAGS,
@@ -702,7 +585,7 @@ static void ldpaa_eth_stop(struct eth_device *net_dev)if (err <0 )printf ("dpni_disable() failed\n" ); - phydev =ldpaa_get_phydev (priv); + phydev = priv->phy;if (phydev)phy_shutdown (phydev);
@@ -1097,7 +980,6 @@ static int ldpaa_dpni_bind(struct ldpaa_eth_priv *priv)return 0 ; } -#ifdef CONFIG_DM_ETH static int ldpaa_eth_probe (struct udevice *dev) {struct ofnode_phandle_args phandle;
@@ -1177,79 +1059,3 @@ U_BOOT_DRIVER(ldpaa_eth) = { .priv_auto = sizeof(struct ldpaa_eth_priv), .plat_auto = sizeof(struct eth_pdata), }; - -#else - -static int ldpaa_eth_netdev_init (struct eth_device *net_dev, -phy_interface_t enet_if) -{ -int err; -struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)net_dev->priv; - -snprintf (net_dev->name,ETH_NAME_LEN ,"DPMAC%d@%s" , priv->dpmac_id, - phy_interface_strings[enet_if]); - - net_dev->iobase =0 ; - net_dev->init = ldpaa_eth_open; - net_dev->halt = ldpaa_eth_stop; - net_dev->send = ldpaa_eth_tx; - net_dev->recv = ldpaa_eth_pull_dequeue_rx; - -#ifdef CONFIG_PHYLIB - err =init_phy (net_dev); -if (err <0 ) -return err; -#endif - - err =eth_register (net_dev); -if (err <0 ) { -printf ("eth_register() = %d\n" , err); -return err; - } - -return 0 ; -} - -int ldpaa_eth_init (int dpmac_id,phy_interface_t enet_if) -{ -struct eth_device *net_dev =NULL ; -struct ldpaa_eth_priv *priv =NULL ; -int err =0 ; - -/* Net device */ - net_dev = (struct eth_device *)malloc (sizeof (struct eth_device )); -if (!net_dev) { -printf ("eth_device malloc() failed\n" ); -return -ENOMEM ; - } -memset (net_dev,0 ,sizeof (struct eth_device )); - -/* alloc the ldpaa ethernet private struct */ - priv = (struct ldpaa_eth_priv *)malloc (sizeof (struct ldpaa_eth_priv )); -if (!priv) { -printf ("ldpaa_eth_priv malloc() failed\n" ); -free (net_dev); -return -ENOMEM ; - } -memset (priv,0 ,sizeof (struct ldpaa_eth_priv )); - - net_dev->priv = (void *)priv; - priv->net_dev = (struct eth_device *)net_dev; - priv->dpmac_id = dpmac_id; -debug ("%s dpmac_id=%d\n" , __func__, dpmac_id); - - err =ldpaa_eth_netdev_init (net_dev, enet_if); -if (err) - goto err_netdev_init; - -debug ("ldpaa ethernet: Probed interface %s\n" , net_dev->name); -return 0 ; - -err_netdev_init: -free (priv); - net_dev->priv =NULL ; -free (net_dev); - -return err; -} -#endif
drivers/net/ldpaa_eth/ldpaa_eth.h +0 -4
@@ -116,13 +116,9 @@ struct ldpaa_fas { LDPAA_ETH_FAS_TIDE)struct ldpaa_eth_priv { -#ifdef CONFIG_DM_ETH struct phy_device *phy;int phy_mode;bool started; -#else -struct eth_device *net_dev; -#endif uint32_t dpmac_id;uint16_t dpmac_handle;
Signature · 1 line
2.25.1