power: pmic: Guard non-DM_PMIC drivers with a check for POWER_LEGACY
Subsystems (59)
PATCH 91/149 global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG
In reply to Tom RiniPerform simple renames of:
CONFIG_MXC_USB_FLAGS to CFG_MXC_USB_FLAGS
CONFIG_MXC_USB_PORT to CFG_MXC_USB_PORT
CONFIG_MXC_USB_PORTSC to CFG_MXC_USB_PORTSC
--- drivers/usb/host/ehci-mx5.c | 4 ++-- drivers/usb/host/ehci-mx6.c | 8 ++++---- include/configs/apalis_imx6.h | 4 ++-- include/configs/aristainetos2.h | 4 ++-- include/configs/brppt2.h | 2 +- include/configs/cl-som-imx7.h | 4 ++-- include/configs/cm_fx6.h | 4 ++-- include/configs/colibri-imx6ull.h | 4 ++-- include/configs/colibri_imx6.h | 4 ++-- include/configs/colibri_imx7.h | 4 ++-- include/configs/dart_6ul.h | 4 ++-- include/configs/dh_imx6.h | 4 ++-- include/configs/display5.h | 2 +- include/configs/embestmx6boards.h | 4 ++-- include/configs/ge_b1x5v2.h | 4 ++-- include/configs/gw_ventana.h | 4 ++-- include/configs/imx6_logic.h | 4 ++-- include/configs/imx6dl-mamoj.h | 4 ++-- include/configs/imx6q-bosch-acc.h | 4 ++-- include/configs/imx7-cm.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/kontron-sl-mx6ul.h | 4 ++-- include/configs/kontron-sl-mx8mm.h | 4 ++-- include/configs/kp_imx53.h | 4 ++-- include/configs/kp_imx6q_tpc.h | 4 ++-- include/configs/liteboard.h | 4 ++-- include/configs/m53menlo.h | 6 +++--- include/configs/meerkat96.h | 2 +- include/configs/mx51evk.h | 6 +++--- include/configs/mx53cx9020.h | 6 +++--- include/configs/mx53loco.h | 6 +++--- include/configs/mx53ppd.h | 6 +++--- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6memcal.h | 2 +- include/configs/mx6sabreauto.h | 4 ++-- include/configs/mx6sabresd.h | 4 ++-- include/configs/mx6slevk.h | 4 ++-- include/configs/mx6sllevk.h | 2 +- include/configs/mx6sxsabreauto.h | 4 ++-- include/configs/mx6sxsabresd.h | 4 ++-- include/configs/mx6ul_14x14_evk.h | 4 ++-- include/configs/mx7dsabresd.h | 2 +- include/configs/mx7ulp_com.h | 2 +- include/configs/mys_6ulx.h | 4 ++-- include/configs/nitrogen6x.h | 4 ++-- include/configs/novena.h | 4 ++-- include/configs/npi_imx6ull.h | 4 ++-- include/configs/o4-imx6ull-nano.h | 2 +- include/configs/opos6uldev.h | 4 ++-- include/configs/pcl063.h | 4 ++-- include/configs/pcl063_ull.h | 4 ++-- include/configs/pico-imx6.h | 4 ++-- include/configs/pico-imx6ul.h | 4 ++-- include/configs/pico-imx7d.h | 4 ++-- include/configs/somlabs_visionsom_6ull.h | 4 ++-- include/configs/tbs2910.h | 2 +- include/configs/tqma6.h | 2 +- include/configs/usbarmory.h | 6 +++--- include/configs/verdin-imx8mm.h | 2 +- include/configs/vining_2000.h | 4 ++-- include/configs/wandboard.h | 4 ++-- include/configs/warp7.h | 2 +- include/configs/xpress.h | 4 ++-- 63 files changed, 119 insertions(+), 119 deletions(-)
drivers/usb/host/ehci-mx5.c +2 -2
@@ -299,10 +299,10 @@ static int ehci_usb_probe(struct udevice *dev) HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));setbits_le32 (&ehci->usbmode,CM_HOST ); -__raw_writel (CONFIG_MXC_USB_PORTSC , &ehci->portsc); +__raw_writel (CFG_MXC_USB_PORTSC , &ehci->portsc);setbits_le32 (&ehci->portsc,USB_EN ); -mxc_set_usbcontrol (priv->portnr,CONFIG_MXC_USB_FLAGS ); +mxc_set_usbcontrol (priv->portnr,CFG_MXC_USB_FLAGS );mdelay (10 ); return ehci_register(dev, hccr, hcor, &mx5_ehci_ops, 0,
drivers/usb/host/ehci-mx6.c +4 -4
@@ -70,8 +70,8 @@ DECLARE_GLOBAL_DATA_PTR;#define UCMD_RESET (1 << 1)/* controller reset */ /* If this is not defined, assume MX6/MX7/MX8M SoC default */ -#ifndef CONFIG_MXC_USB_PORTSC -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#ifndef CFG_MXC_USB_PORTSC +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* Base address for this IP block is 0x02184800 */
@@ -411,7 +411,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,return 0 ;setbits_le32 (&ehci->usbmode,CM_HOST ); -writel (CONFIG_MXC_USB_PORTSC , &ehci->portsc); +writel (CFG_MXC_USB_PORTSC , &ehci->portsc);setbits_le32 (&ehci->portsc,USB_EN );mdelay (10 );
@@ -454,7 +454,7 @@ static u32 mx6_portsc(enum usb_phy_interface phy_type)case USBPHY_INTERFACE_MODE_HSIC :return PORT_PTS_HSIC ;default : -return CONFIG_MXC_USB_PORTSC ; +return CFG_MXC_USB_PORTSC ; } }
include/configs/apalis_imx6.h +2 -2
@@ -26,8 +26,8 @@/* USB Configs */ /* Host */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Framebuffer and LCD */
include/configs/aristainetos2.h +2 -2
@@ -413,8 +413,8 @@/* DMA stuff, needed for GPMI/MXS NAND support */ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* UBI support */
include/configs/brppt2.h +1 -1
@@ -79,6 +79,6 @@ BUR_COMMON_ENV \#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* __CONFIG_BRPP2_IMX6_H */
include/configs/cl-som-imx7.h +2 -2
@@ -96,7 +96,7 @@#endif /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* __CONFIG_H */
include/configs/cm_fx6.h +2 -2
@@ -135,8 +135,8 @@#define CFG_FEC_MXC_PHYADDR 0/* USB */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Boot */ #define CFG_SYS_BOOTMAPSZ (8 << 20)
include/configs/colibri-imx6ull.h +2 -2
@@ -123,8 +123,8 @@/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* USB Device Firmware Update support */ #define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/colibri_imx6.h +2 -2
@@ -23,8 +23,8 @@/* USB Configs */ /* Host */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Command definition */
include/configs/colibri_imx7.h +2 -2
@@ -167,7 +167,7 @@/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif
include/configs/dart_6ul.h +2 -2
@@ -47,8 +47,8 @@#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define ENV_MMC \ "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
include/configs/dh_imx6.h +2 -2
@@ -32,8 +32,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* USB Gadget (DFU, UMS) */ #if defined(CONFIG_CMD_DFU ) || defined(CONFIG_CMD_USB_MASS_STORAGE )
include/configs/display5.h +1 -1
@@ -288,5 +288,5 @@/* The 0x120000 value corresponds to above SPI-NOR memory MAP */ #endif -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* __CONFIG_H */
include/configs/embestmx6boards.h +2 -2
@@ -18,8 +18,8 @@#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/ge_b1x5v2.h +2 -2
@@ -24,8 +24,8 @@#endif /* USB */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Memory */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
include/configs/gw_ventana.h +2 -2
@@ -36,8 +36,8 @@/* Various command support */ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Miscellaneous configurable options */
include/configs/imx6_logic.h +2 -2
@@ -117,8 +117,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* Falcon Mode */
include/configs/imx6dl-mamoj.h +2 -2
@@ -43,8 +43,8 @@#define CFG_FEC_MXC_PHYADDR 1/* USB */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Falcon */
include/configs/imx6q-bosch-acc.h +2 -2
@@ -110,7 +110,7 @@#endif #endif -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* __IMX6Q_ACC_H */
include/configs/imx7-cm.h +1 -1
@@ -79,6 +79,6 @@/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* __CONFIG_H */
include/configs/imx8mm-cl-iot-gate.h +1 -1
@@ -139,6 +139,6 @@#define CFG_FEC_MXC_PHYADDR 0/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /*__IMX8MM_CL_IOT_GATE_H*/
include/configs/kontron-sl-mx6ul.h +2 -2
@@ -25,8 +25,8 @@#define CFG_MXC_UART_BASE UART4_BASE#ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* Boot order for distro boot */
include/configs/kontron-sl-mx8mm.h +2 -2
@@ -25,8 +25,8 @@/* Board and environment settings */ #ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* GUID for capsule updatable firmware image */
include/configs/kp_imx53.h +2 -2
@@ -11,8 +11,8 @@#include <linux/sizes.h> /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Command definition */
include/configs/kp_imx6q_tpc.h +2 -2
@@ -18,8 +18,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #define CFG_EXTRA_ENV_SETTINGS \
include/configs/liteboard.h +2 -2
@@ -95,8 +95,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #ifdef CONFIG_CMD_NET
include/configs/m53menlo.h +3 -3
@@ -70,9 +70,9 @@* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* LVDS display */
include/configs/meerkat96.h +1 -1
@@ -24,6 +24,6 @@/* Environment configs */ /* USB configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif
include/configs/mx51evk.h +3 -3
@@ -33,9 +33,9 @@#define CFG_SYS_FSL_ESDHC_ADDR MMC_SDHC1_BASE_ADDR/* USB Configs */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC PORT_PTS_ULPI -#define CONFIG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC PORT_PTS_ULPI +#define CFG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED/* Framebuffer and LCD */
include/configs/mx53cx9020.h +3 -3
@@ -23,9 +23,9 @@/* USB Configs */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Command definition */
include/configs/mx53loco.h +3 -3
@@ -17,9 +17,9 @@#define CFG_SYS_FSL_ESDHC_ADDR 0/* USB Configs */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* PMIC Controller */ #define CFG_SYS_DIALOG_PMIC_I2C_ADDR 0x48
include/configs/mx53ppd.h +3 -3
@@ -12,9 +12,9 @@#include <asm/arch/imx-regs.h> /* USB Configs */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Command definition */
include/configs/mx6cuboxi.h +1 -1
@@ -15,7 +15,7 @@#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR/* USB */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)/* Command definition */
include/configs/mx6memcal.h +1 -1
@@ -31,6 +31,6 @@#define CFG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE -#define CONFIG_MXC_USB_PORTSC PORT_PTS_UTMI +#define CFG_MXC_USB_PORTSC PORT_PTS_UTMI#endif /* __CONFIG_H */
include/configs/mx6sabreauto.h +2 -2
@@ -12,8 +12,8 @@#define CONSOLE_DEV "ttymxc3"/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define CFG_SYS_I2C_PCA953X_WIDTH { {0x30, 8}, {0x32, 8}, {0x34, 8} }
include/configs/mx6sabresd.h +2 -2
@@ -29,8 +29,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #endif /* __MX6SABRESD_CONFIG_H */
include/configs/mx6slevk.h +2 -2
@@ -90,8 +90,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #define CFG_SYS_FSL_USDHC_NUM 3
include/configs/mx6sllevk.h +1 -1
@@ -94,7 +94,7 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif #include <linux/stringify.h>
include/configs/mx6sxsabreauto.h +2 -2
@@ -96,8 +96,8 @@#define CFG_FEC_MXC_PHYADDR 0x0#ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #define CFG_SYS_FSL_USDHC_NUM 2
include/configs/mx6sxsabresd.h +2 -2
@@ -118,8 +118,8 @@#define CFG_FEC_MXC_PHYADDR 0x1#ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #ifdef CONFIG_CMD_PCI
include/configs/mx6ul_14x14_evk.h +2 -2
@@ -116,8 +116,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #ifdef CONFIG_CMD_NET
include/configs/mx7dsabresd.h +1 -1
@@ -99,6 +99,6 @@#endif /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* __CONFIG_H */
include/configs/mx7ulp_com.h +1 -1
@@ -51,5 +51,5 @@#define CFG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR#define CFG_SYS_INIT_RAM_SIZE SZ_256K -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* __CONFIG_H */
include/configs/mys_6ulx.h +2 -2
@@ -30,8 +30,8 @@#define CFG_SYS_NAND_BASE 0x40000000/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \
include/configs/nitrogen6x.h +2 -2
@@ -21,8 +21,8 @@#define CFG_FEC_MXC_PHYADDR 6/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#ifdef CONFIG_CMD_MMC #define DISTRO_BOOT_DEV_MMC (func) func(MMC, mmc, 0) func(MMC, mmc, 1)
include/configs/novena.h +2 -2
@@ -53,8 +53,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* Extra U-Boot environment. */
include/configs/npi_imx6ull.h +2 -2
@@ -29,8 +29,8 @@#define CFG_SYS_NAND_BASE 0x40000000/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#ifdef CONFIG_CMD_NET #define CFG_FEC_MXC_PHYADDR 0x1
include/configs/o4-imx6ull-nano.h +1 -1
@@ -12,7 +12,7 @@#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE#if IS_ENABLED (CONFIG_CMD_USB ) -# define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +# define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* CONFIG_CMD_USB */ #define CFG_EXTRA_ENV_SETTINGS \
include/configs/opos6uldev.h +2 -2
@@ -19,8 +19,8 @@/* USB */ #ifdef CONFIG_USB_EHCI_MX6 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* LCD */
include/configs/pcl063.h +2 -2
@@ -42,8 +42,8 @@#define CFG_SYS_NAND_BASE 0x40000000/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \
include/configs/pcl063_ull.h +2 -2
@@ -44,8 +44,8 @@#define CFG_SYS_NAND_BASE 0x40000000/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define ENV_MMC \ "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
include/configs/pico-imx6.h +2 -2
@@ -16,8 +16,8 @@#define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/pico-imx6ul.h +2 -2
@@ -23,8 +23,8 @@#define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/pico-imx7d.h +2 -2
@@ -107,7 +107,7 @@#define CFG_SYS_FSL_USDHC_NUM 2/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif
include/configs/somlabs_visionsom_6ull.h +2 -2
@@ -61,8 +61,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #ifdef CONFIG_CMD_NET
include/configs/tbs2910.h +1 -1
@@ -27,7 +27,7 @@/* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* CONFIG_CMD_USB */ #define CFG_EXTRA_ENV_SETTINGS \
include/configs/tqma6.h +1 -1
@@ -39,7 +39,7 @@#define CFG_SYS_FSL_ESDHC_ADDR 0/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#if defined(CONFIG_TQMA6X_MMC_BOOT )
include/configs/usbarmory.h +3 -3
@@ -23,9 +23,9 @@#define CFG_SYS_FSL_ESDHC_ADDR 0/* USB */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Linux boot */
include/configs/verdin-imx8mm.h +1 -1
@@ -67,6 +67,6 @@#define PHYS_SDRAM_SIZE SZ_2G/* 2GB DDR */ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* __VERDIN_IMX8MM_H */
include/configs/vining_2000.h +2 -2
@@ -36,8 +36,8 @@/* Network */ #define CFG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#ifdef CONFIG_CMD_PCI #define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6)
include/configs/wandboard.h +2 -2
@@ -17,8 +17,8 @@#define CFG_SYS_FSL_ESDHC_ADDR 0/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0\0" \
include/configs/warp7.h +1 -1
@@ -93,7 +93,7 @@#define CFG_SYS_FSL_USDHC_NUM 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)/* USB Device Firmware Update support */ #define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/xpress.h +2 -2
@@ -28,8 +28,8 @@/* Environment is in stored in the eMMC boot partition */ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define CFG_FEC_ENET_DEV 0#define CFG_FEC_MXC_PHYADDR 0x0
Signature · 1 line
2.25.1
Re: [PATCH 001/149] exynos: Rework legacy PWM usage
In reply to Tom RiniQuoted 13 lines · Tom Rini
The way that the timer support is currently done for exynos/nexell platforms relies on the legacy PWM infrastructure, and that needs to be updated. However, we really cannot safely undef
CONFIG_DM_PWMto build thetimer.cfile without warnings. For now, rename the relevant legacy functions to be prefixed withs5p_and add prototypes to the archpwm.hfiles.Cc Minkyu Kang <[email protected]>Cc Jaehoon Chung <[email protected]>Cc Dzmitry Sankouski <[email protected]>Cc Stefan Bosch <[email protected]>Signed-off-by Tom Rini <[email protected]>
Quoted 9 lines
--- arch/arm/cpu/armv7/s5p-common/pwm.c | 11 +++++------ arch/arm/cpu/armv7/s5p-common/timer.c | 10 +++------- arch/arm/mach-exynos/include/mach/pwm.h | 5 +++++ arch/arm/mach-nexell/include/mach/pwm.h | 5 +++++ arch/arm/mach-s5pc1xx/include/mach/pwm.h | 5 +++++ board/friendlyarm/nanopi2/board.c | 4 ++-- board/friendlyarm/nanopi2/onewire.c | 4 ++-- 7 files changed, 27 insertions(+), 17 deletions(-)
Can someone update this to use driver model?
- Simon
Re: [PATCH 001/149] exynos: Rework legacy PWM usage
In reply to Tom RiniQuoted 7 lines · Tom Rini
The way that the timer support is currently done for exynos/nexell platforms relies on the legacy PWM infrastructure, and that needs to be updated. However, we really cannot safely undef
CONFIG_DM_PWMto build thetimer.cfile without warnings. For now, rename the relevant legacy functions to be prefixed withs5p_and add prototypes to the archpwm.hfiles.
Quoted 6 lines
Cc Minkyu Kang <[email protected]>Cc Jaehoon Chung <[email protected]>Cc Dzmitry Sankouski <[email protected]>Cc Stefan Bosch <[email protected]>Signed-off-by Tom Rini <[email protected]>Reviewed-by Simon Glass <[email protected]>
For the series, applied to u-boot/next, thanks!
Signature · 1 line
Tom
PATCH 91/149 global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG
In reply to Tom RiniPerform simple renames of:
CONFIG_MXC_USB_FLAGS to CFG_MXC_USB_FLAGS
CONFIG_MXC_USB_PORT to CFG_MXC_USB_PORT
CONFIG_MXC_USB_PORTSC to CFG_MXC_USB_PORTSC
--- drivers/usb/host/ehci-mx5.c | 4 ++-- drivers/usb/host/ehci-mx6.c | 8 ++++---- include/configs/apalis_imx6.h | 4 ++-- include/configs/aristainetos2.h | 4 ++-- include/configs/brppt2.h | 2 +- include/configs/cl-som-imx7.h | 4 ++-- include/configs/cm_fx6.h | 4 ++-- include/configs/colibri-imx6ull.h | 4 ++-- include/configs/colibri_imx6.h | 4 ++-- include/configs/colibri_imx7.h | 4 ++-- include/configs/dart_6ul.h | 4 ++-- include/configs/dh_imx6.h | 4 ++-- include/configs/display5.h | 2 +- include/configs/embestmx6boards.h | 4 ++-- include/configs/ge_b1x5v2.h | 4 ++-- include/configs/gw_ventana.h | 4 ++-- include/configs/imx6_logic.h | 4 ++-- include/configs/imx6dl-mamoj.h | 4 ++-- include/configs/imx6q-bosch-acc.h | 4 ++-- include/configs/imx7-cm.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/kontron-sl-mx6ul.h | 4 ++-- include/configs/kontron-sl-mx8mm.h | 4 ++-- include/configs/kp_imx53.h | 4 ++-- include/configs/kp_imx6q_tpc.h | 4 ++-- include/configs/liteboard.h | 4 ++-- include/configs/m53menlo.h | 6 +++--- include/configs/meerkat96.h | 2 +- include/configs/mx51evk.h | 6 +++--- include/configs/mx53cx9020.h | 6 +++--- include/configs/mx53loco.h | 6 +++--- include/configs/mx53ppd.h | 6 +++--- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6memcal.h | 2 +- include/configs/mx6sabreauto.h | 4 ++-- include/configs/mx6sabresd.h | 4 ++-- include/configs/mx6slevk.h | 4 ++-- include/configs/mx6sllevk.h | 2 +- include/configs/mx6sxsabreauto.h | 4 ++-- include/configs/mx6sxsabresd.h | 4 ++-- include/configs/mx6ul_14x14_evk.h | 4 ++-- include/configs/mx7dsabresd.h | 2 +- include/configs/mx7ulp_com.h | 2 +- include/configs/mys_6ulx.h | 4 ++-- include/configs/nitrogen6x.h | 4 ++-- include/configs/novena.h | 4 ++-- include/configs/npi_imx6ull.h | 4 ++-- include/configs/o4-imx6ull-nano.h | 2 +- include/configs/opos6uldev.h | 4 ++-- include/configs/pcl063.h | 4 ++-- include/configs/pcl063_ull.h | 4 ++-- include/configs/pico-imx6.h | 4 ++-- include/configs/pico-imx6ul.h | 4 ++-- include/configs/pico-imx7d.h | 4 ++-- include/configs/somlabs_visionsom_6ull.h | 4 ++-- include/configs/tbs2910.h | 2 +- include/configs/tqma6.h | 2 +- include/configs/usbarmory.h | 6 +++--- include/configs/verdin-imx8mm.h | 2 +- include/configs/vining_2000.h | 4 ++-- include/configs/wandboard.h | 4 ++-- include/configs/warp7.h | 2 +- include/configs/xpress.h | 4 ++-- 63 files changed, 119 insertions(+), 119 deletions(-)
drivers/usb/host/ehci-mx5.c +2 -2
@@ -299,10 +299,10 @@ static int ehci_usb_probe(struct udevice *dev) HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));setbits_le32 (&ehci->usbmode,CM_HOST ); -__raw_writel (CONFIG_MXC_USB_PORTSC , &ehci->portsc); +__raw_writel (CFG_MXC_USB_PORTSC , &ehci->portsc);setbits_le32 (&ehci->portsc,USB_EN ); -mxc_set_usbcontrol (priv->portnr,CONFIG_MXC_USB_FLAGS ); +mxc_set_usbcontrol (priv->portnr,CFG_MXC_USB_FLAGS );mdelay (10 ); return ehci_register(dev, hccr, hcor, &mx5_ehci_ops, 0,
drivers/usb/host/ehci-mx6.c +4 -4
@@ -70,8 +70,8 @@ DECLARE_GLOBAL_DATA_PTR;#define UCMD_RESET (1 << 1)/* controller reset */ /* If this is not defined, assume MX6/MX7/MX8M SoC default */ -#ifndef CONFIG_MXC_USB_PORTSC -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#ifndef CFG_MXC_USB_PORTSC +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* Base address for this IP block is 0x02184800 */
@@ -411,7 +411,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,return 0 ;setbits_le32 (&ehci->usbmode,CM_HOST ); -writel (CONFIG_MXC_USB_PORTSC , &ehci->portsc); +writel (CFG_MXC_USB_PORTSC , &ehci->portsc);setbits_le32 (&ehci->portsc,USB_EN );mdelay (10 );
@@ -454,7 +454,7 @@ static u32 mx6_portsc(enum usb_phy_interface phy_type)case USBPHY_INTERFACE_MODE_HSIC :return PORT_PTS_HSIC ;default : -return CONFIG_MXC_USB_PORTSC ; +return CFG_MXC_USB_PORTSC ; } }
include/configs/apalis_imx6.h +2 -2
@@ -26,8 +26,8 @@/* USB Configs */ /* Host */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Framebuffer and LCD */
include/configs/aristainetos2.h +2 -2
@@ -413,8 +413,8 @@/* DMA stuff, needed for GPMI/MXS NAND support */ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* UBI support */
include/configs/brppt2.h +1 -1
@@ -79,6 +79,6 @@ BUR_COMMON_ENV \#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* __CONFIG_BRPP2_IMX6_H */
include/configs/cl-som-imx7.h +2 -2
@@ -96,7 +96,7 @@#endif /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* __CONFIG_H */
include/configs/cm_fx6.h +2 -2
@@ -135,8 +135,8 @@#define CFG_FEC_MXC_PHYADDR 0/* USB */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Boot */ #define CFG_SYS_BOOTMAPSZ (8 << 20)
include/configs/colibri-imx6ull.h +2 -2
@@ -123,8 +123,8 @@/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* USB Device Firmware Update support */ #define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/colibri_imx6.h +2 -2
@@ -23,8 +23,8 @@/* USB Configs */ /* Host */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Command definition */
include/configs/colibri_imx7.h +2 -2
@@ -167,7 +167,7 @@/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif
include/configs/dart_6ul.h +2 -2
@@ -47,8 +47,8 @@#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define ENV_MMC \ "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
include/configs/dh_imx6.h +2 -2
@@ -32,8 +32,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* USB Gadget (DFU, UMS) */ #if defined(CONFIG_CMD_DFU ) || defined(CONFIG_CMD_USB_MASS_STORAGE )
include/configs/display5.h +1 -1
@@ -288,5 +288,5 @@/* The 0x120000 value corresponds to above SPI-NOR memory MAP */ #endif -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* __CONFIG_H */
include/configs/embestmx6boards.h +2 -2
@@ -18,8 +18,8 @@#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/ge_b1x5v2.h +2 -2
@@ -24,8 +24,8 @@#endif /* USB */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Memory */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
include/configs/gw_ventana.h +2 -2
@@ -36,8 +36,8 @@/* Various command support */ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Miscellaneous configurable options */
include/configs/imx6_logic.h +2 -2
@@ -117,8 +117,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* Falcon Mode */
include/configs/imx6dl-mamoj.h +2 -2
@@ -43,8 +43,8 @@#define CFG_FEC_MXC_PHYADDR 1/* USB */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Falcon */
include/configs/imx6q-bosch-acc.h +2 -2
@@ -110,7 +110,7 @@#endif #endif -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* __IMX6Q_ACC_H */
include/configs/imx7-cm.h +1 -1
@@ -79,6 +79,6 @@/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* __CONFIG_H */
include/configs/imx8mm-cl-iot-gate.h +1 -1
@@ -139,6 +139,6 @@#define CFG_FEC_MXC_PHYADDR 0/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /*__IMX8MM_CL_IOT_GATE_H*/
include/configs/kontron-sl-mx6ul.h +2 -2
@@ -25,8 +25,8 @@#define CFG_MXC_UART_BASE UART4_BASE#ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* Boot order for distro boot */
include/configs/kontron-sl-mx8mm.h +2 -2
@@ -25,8 +25,8 @@/* Board and environment settings */ #ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* GUID for capsule updatable firmware image */
include/configs/kp_imx53.h +2 -2
@@ -11,8 +11,8 @@#include <linux/sizes.h> /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Command definition */
include/configs/kp_imx6q_tpc.h +2 -2
@@ -18,8 +18,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #define CFG_EXTRA_ENV_SETTINGS \
include/configs/liteboard.h +2 -2
@@ -95,8 +95,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #ifdef CONFIG_CMD_NET
include/configs/m53menlo.h +3 -3
@@ -70,9 +70,9 @@* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* LVDS display */
include/configs/meerkat96.h +1 -1
@@ -24,6 +24,6 @@/* Environment configs */ /* USB configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif
include/configs/mx51evk.h +3 -3
@@ -33,9 +33,9 @@#define CFG_SYS_FSL_ESDHC_ADDR MMC_SDHC1_BASE_ADDR/* USB Configs */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC PORT_PTS_ULPI -#define CONFIG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC PORT_PTS_ULPI +#define CFG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED/* Framebuffer and LCD */
include/configs/mx53cx9020.h +3 -3
@@ -23,9 +23,9 @@/* USB Configs */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Command definition */
include/configs/mx53loco.h +3 -3
@@ -17,9 +17,9 @@#define CFG_SYS_FSL_ESDHC_ADDR 0/* USB Configs */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* PMIC Controller */ #define CFG_SYS_DIALOG_PMIC_I2C_ADDR 0x48
include/configs/mx53ppd.h +3 -3
@@ -12,9 +12,9 @@#include <asm/arch/imx-regs.h> /* USB Configs */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Command definition */
include/configs/mx6cuboxi.h +1 -1
@@ -15,7 +15,7 @@#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR/* USB */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)/* Command definition */
include/configs/mx6memcal.h +1 -1
@@ -31,6 +31,6 @@#define CFG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE -#define CONFIG_MXC_USB_PORTSC PORT_PTS_UTMI +#define CFG_MXC_USB_PORTSC PORT_PTS_UTMI#endif /* __CONFIG_H */
include/configs/mx6sabreauto.h +2 -2
@@ -12,8 +12,8 @@#define CONSOLE_DEV "ttymxc3"/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define CFG_SYS_I2C_PCA953X_WIDTH { {0x30, 8}, {0x32, 8}, {0x34, 8} }
include/configs/mx6sabresd.h +2 -2
@@ -29,8 +29,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #endif /* __MX6SABRESD_CONFIG_H */
include/configs/mx6slevk.h +2 -2
@@ -90,8 +90,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #define CFG_SYS_FSL_USDHC_NUM 3
include/configs/mx6sllevk.h +1 -1
@@ -94,7 +94,7 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif #include <linux/stringify.h>
include/configs/mx6sxsabreauto.h +2 -2
@@ -96,8 +96,8 @@#define CFG_FEC_MXC_PHYADDR 0x0#ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #define CFG_SYS_FSL_USDHC_NUM 2
include/configs/mx6sxsabresd.h +2 -2
@@ -118,8 +118,8 @@#define CFG_FEC_MXC_PHYADDR 0x1#ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #ifdef CONFIG_CMD_PCI
include/configs/mx6ul_14x14_evk.h +2 -2
@@ -116,8 +116,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #ifdef CONFIG_CMD_NET
include/configs/mx7dsabresd.h +1 -1
@@ -99,6 +99,6 @@#endif /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* __CONFIG_H */
include/configs/mx7ulp_com.h +1 -1
@@ -51,5 +51,5 @@#define CFG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR#define CFG_SYS_INIT_RAM_SIZE SZ_256K -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* __CONFIG_H */
include/configs/mys_6ulx.h +2 -2
@@ -30,8 +30,8 @@#define CFG_SYS_NAND_BASE 0x40000000/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \
include/configs/nitrogen6x.h +2 -2
@@ -21,8 +21,8 @@#define CFG_FEC_MXC_PHYADDR 6/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#ifdef CONFIG_CMD_MMC #define DISTRO_BOOT_DEV_MMC (func) func(MMC, mmc, 0) func(MMC, mmc, 1)
include/configs/novena.h +2 -2
@@ -53,8 +53,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* Extra U-Boot environment. */
include/configs/npi_imx6ull.h +2 -2
@@ -29,8 +29,8 @@#define CFG_SYS_NAND_BASE 0x40000000/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#ifdef CONFIG_CMD_NET #define CFG_FEC_MXC_PHYADDR 0x1
include/configs/o4-imx6ull-nano.h +1 -1
@@ -12,7 +12,7 @@#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE#if IS_ENABLED (CONFIG_CMD_USB ) -# define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +# define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* CONFIG_CMD_USB */ #define CFG_EXTRA_ENV_SETTINGS \
include/configs/opos6uldev.h +2 -2
@@ -19,8 +19,8 @@/* USB */ #ifdef CONFIG_USB_EHCI_MX6 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif /* LCD */
include/configs/pcl063.h +2 -2
@@ -42,8 +42,8 @@#define CFG_SYS_NAND_BASE 0x40000000/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \
include/configs/pcl063_ull.h +2 -2
@@ -44,8 +44,8 @@#define CFG_SYS_NAND_BASE 0x40000000/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define ENV_MMC \ "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
include/configs/pico-imx6.h +2 -2
@@ -16,8 +16,8 @@#define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/pico-imx6ul.h +2 -2
@@ -23,8 +23,8 @@#define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/pico-imx7d.h +2 -2
@@ -107,7 +107,7 @@#define CFG_SYS_FSL_USDHC_NUM 2/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif
include/configs/somlabs_visionsom_6ull.h +2 -2
@@ -61,8 +61,8 @@/* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#endif #ifdef CONFIG_CMD_NET
include/configs/tbs2910.h +1 -1
@@ -27,7 +27,7 @@/* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* CONFIG_CMD_USB */ #define CFG_EXTRA_ENV_SETTINGS \
include/configs/tqma6.h +1 -1
@@ -39,7 +39,7 @@#define CFG_SYS_FSL_ESDHC_ADDR 0/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#if defined(CONFIG_TQMA6X_MMC_BOOT )
include/configs/usbarmory.h +3 -3
@@ -23,9 +23,9 @@#define CFG_SYS_FSL_ESDHC_ADDR 0/* USB */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0/* Linux boot */
include/configs/verdin-imx8mm.h +1 -1
@@ -67,6 +67,6 @@#define PHYS_SDRAM_SIZE SZ_2G/* 2GB DDR */ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#endif /* __VERDIN_IMX8MM_H */
include/configs/vining_2000.h +2 -2
@@ -36,8 +36,8 @@/* Network */ #define CFG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#ifdef CONFIG_CMD_PCI #define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6)
include/configs/wandboard.h +2 -2
@@ -17,8 +17,8 @@#define CFG_SYS_FSL_ESDHC_ADDR 0/* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0\0" \
include/configs/warp7.h +1 -1
@@ -93,7 +93,7 @@#define CFG_SYS_FSL_USDHC_NUM 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)/* USB Device Firmware Update support */ #define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/xpress.h +2 -2
@@ -28,8 +28,8 @@/* Environment is in stored in the eMMC boot partition */ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_FLAGS 0#define CFG_FEC_ENET_DEV 0#define CFG_FEC_MXC_PHYADDR 0x0
Signature · 1 line
2.25.1
PATCH 92/149 global: Migrate CONFIG_ODROID_REV_AIN to CFG
Perform a simple rename of CONFIG_ODROID_REV_AIN to CFG_ODROID_REV_AIN
--- board/samsung/common/exynos5-dt-types.c | 4 ++-- include/configs/odroid_xu3.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
board/samsung/common/exynos5-dt-types.c +2 -2
@@ -57,7 +57,7 @@ static int odroid_get_adc_val(unsigned int *adcval)unsigned int adcval_prev =0 ;int ret, retries =20 ; - ret =adc_channel_single_shot ("adc@12D10000" ,CONFIG_ODROID_REV_AIN , + ret =adc_channel_single_shot ("adc@12D10000" ,CFG_ODROID_REV_AIN , &adcval_prev);if (ret)return ret;
@@ -66,7 +66,7 @@ static int odroid_get_adc_val(unsigned int *adcval)mdelay (5 ); ret =adc_channel_single_shot ("adc@12D10000" , -CONFIG_ODROID_REV_AIN , adcval); +CFG_ODROID_REV_AIN , adcval);if (ret)return ret;
include/configs/odroid_xu3.h +1 -1
@@ -52,7 +52,7 @@#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ -#define CONFIG_ODROID_REV_AIN 9 +#define CFG_ODROID_REV_AIN 9/* * Need to override existing one (smdk5420) with odroid so set_board_info will
Signature · 1 line
2.25.1
PATCH 93/149 global: Migrate CONFIG_OTHBOOTARGS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_OTHBOOTARGS to CFG_OTHBOOTARGS
--- include/configs/x86-common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/x86-common.h +3 -3
@@ -27,9 +27,9 @@/* Default environment */ #define CONFIG_RAMDISK_ADDR 0x4000000#if defined(CONFIG_GENERATE_ACPI_TABLE ) || defined(CONFIG_EFI_STUB ) -#define CONFIG_OTHBOOTARGS "othbootargs=\0" +#define CFG_OTHBOOTARGS "othbootargs=\0"#else -#define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0" +#define CFG_OTHBOOTARGS "othbootargs=acpi=off\0"#endif #if defined(CONFIG_DISTRO_DEFAULTS )
@@ -49,7 +49,7 @@"pciconfighost=1\0" \"netdev=eth0\0" \"consoledev=ttyS0\0" \ -CONFIG_OTHBOOTARGS \ +CFG_OTHBOOTARGS \"scriptaddr=0x7000000\0" \"kernel_addr_r=0x1000000\0" \"ramdisk_addr_r=0x4000000\0" \
Signature · 1 line
2.25.1
PATCH 94/149 global: Migrate CONFIG_PCIE_IMX_PERST_GPIO to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_PCIE_IMX_PERST_GPIO to CFG_PCIE_IMX_PERST_GPIO
--- drivers/pci/pcie_imx.c | 12 ++++++------ include/configs/mx6sabresd.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/novena.h | 2 +- include/configs/tbs2910.h | 2 +- include/configs/vining_2000.h | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)
drivers/pci/pcie_imx.c +6 -6
@@ -566,7 +566,7 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)* do self-initialisation. * * In case your #PERST pin is connected to a plain GPIO pin of the -* CPU, you can define CONFIG_PCIE_IMX_PERST_GPIO in your board's +* CPU, you can define CFG_PCIE_IMX_PERST_GPIO in your board's * configuration file and the condition below will handle the rest * of the reset toggling. *
@@ -578,13 +578,13 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)* Linux at all in the first place since it's in some non-reset * state due to being previously used in U-Boot. */ -#ifdef CONFIG_PCIE_IMX_PERST_GPIO -gpio_request (CONFIG_PCIE_IMX_PERST_GPIO ,"pcie_reset" ); -gpio_direction_output (CONFIG_PCIE_IMX_PERST_GPIO ,0 ); +#ifdef CFG_PCIE_IMX_PERST_GPIO +gpio_request (CFG_PCIE_IMX_PERST_GPIO ,"pcie_reset" ); +gpio_direction_output (CFG_PCIE_IMX_PERST_GPIO ,0 );mdelay (20 ); -gpio_set_value (CONFIG_PCIE_IMX_PERST_GPIO ,1 ); +gpio_set_value (CFG_PCIE_IMX_PERST_GPIO ,1 );mdelay (20 ); -gpio_free (CONFIG_PCIE_IMX_PERST_GPIO ); +gpio_free (CFG_PCIE_IMX_PERST_GPIO );#else if (dm_gpio_is_valid (gpio)) {/* Assert PERST# for 20ms then de-assert */
include/configs/mx6sabresd.h +1 -1
@@ -20,7 +20,7 @@#define CFG_SYS_FSL_USDHC_NUM 3#ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(3, 19)#endif
include/configs/mx6sxsabresd.h +1 -1
@@ -123,7 +123,7 @@#endif #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0)#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1)#endif
include/configs/novena.h +1 -1
@@ -41,7 +41,7 @@/* PCI express */ #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(3, 29) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(3, 29)#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(7, 12)#endif
include/configs/tbs2910.h +1 -1
@@ -22,7 +22,7 @@/* PCI */ #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)#endif /* USB */
include/configs/vining_2000.h +1 -1
@@ -40,7 +40,7 @@#define CFG_MXC_USB_FLAGS 0#ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6)#endif #define CFG_IMX6_PWM_PER_CLK 66000000
Signature · 1 line
2.25.1
PATCH 95/149 global: Migrate CONFIG_PCIE_IMX_POWER_GPIO to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_PCIE_IMX_POWER_GPIO to CFG_PCIE_IMX_POWER_GPIO
--- drivers/pci/pcie_imx.c | 10 +++++----- include/configs/mx6sabresd.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/novena.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/pci/pcie_imx.c +5 -5
@@ -534,13 +534,13 @@ static int imx6_pcie_init_phy(void)int imx6_pcie_toggle_power (struct udevice *vpcie) { -#ifdef CONFIG_PCIE_IMX_POWER_GPIO -gpio_request (CONFIG_PCIE_IMX_POWER_GPIO ,"pcie_power" ); -gpio_direction_output (CONFIG_PCIE_IMX_POWER_GPIO ,0 ); +#ifdef CFG_PCIE_IMX_POWER_GPIO +gpio_request (CFG_PCIE_IMX_POWER_GPIO ,"pcie_power" ); +gpio_direction_output (CFG_PCIE_IMX_POWER_GPIO ,0 );mdelay (20 ); -gpio_set_value (CONFIG_PCIE_IMX_POWER_GPIO ,1 ); +gpio_set_value (CFG_PCIE_IMX_POWER_GPIO ,1 );mdelay (20 ); -gpio_free (CONFIG_PCIE_IMX_POWER_GPIO ); +gpio_free (CFG_PCIE_IMX_POWER_GPIO );#endif #if CONFIG_IS_ENABLED (DM_REGULATOR )
include/configs/mx6sabresd.h +1 -1
@@ -21,7 +21,7 @@#ifdef CONFIG_CMD_PCI #define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) -#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(3, 19) +#define CFG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(3, 19)#endif /* PMIC */
include/configs/mx6sxsabresd.h +1 -1
@@ -124,7 +124,7 @@#ifdef CONFIG_CMD_PCI #define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0) -#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1) +#define CFG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1)#endif #define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR
include/configs/novena.h +1 -1
@@ -42,7 +42,7 @@/* PCI express */ #ifdef CONFIG_CMD_PCI #define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(3, 29) -#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(7, 12) +#define CFG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(7, 12)#endif /* PMIC */
Signature · 1 line
2.25.1
PATCH 96/149 global: Migrate CONFIG_PHY_ET1011C_TX_CLK_FIX to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_PHY_ET1011C_TX_CLK_FIX to CFG_PHY_ET1011C_TX_CLK_FIX
--- drivers/net/phy/et1011c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/et1011c.c +1 -1
@@ -60,7 +60,7 @@ static int et1011c_parse_status(struct phy_device *phydev) mii_reg | ET1011C_GMII_INTERFACE | ET1011C_SYS_CLK_EN | -#ifdef CONFIG_PHY_ET1011C_TX_CLK_FIX +#ifdef CFG_PHY_ET1011C_TX_CLK_FIX ET1011C_TX_CLK_EN | #endif ET1011C_TX_FIFO_DEPTH_16);
Signature · 1 line
2.25.1
PATCH 97/149 global: Migrate CONFIG_PHY_ID to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_PHY_ID to CFG_PHY_ID
--- board/egnite/ethernut5/ethernut5.c | 2 +- include/configs/ethernut5.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
board/egnite/ethernut5/ethernut5.c +1 -1
@@ -160,7 +160,7 @@ int board_eth_init(struct bd_info *bis)/* Set peripheral pins. */ at91_macb_hw_init ();/* Basic EMAC initialization. */ -if (macb_eth_initialize (0 , (void *)ATMEL_BASE_EMAC0 ,CONFIG_PHY_ID )) +if (macb_eth_initialize (0 , (void *)ATMEL_BASE_EMAC0 ,CFG_PHY_ID ))return -1 ;/* * Early board revisions have a pull-down at the PHY's MODE0
include/configs/ethernut5.h +1 -1
@@ -48,7 +48,7 @@/* JFFS2 */ /* Ethernet */ -#define CONFIG_PHY_ID 0 +#define CFG_PHY_ID 0/* MMC */ #ifdef CONFIG_CMD_MMC
Signature · 1 line
2.25.1
PATCH 98/149 global: Migrate CONFIG_PHY_IRAM_BASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_PHY_IRAM_BASE to CFG_PHY_IRAM_BASE
--- arch/arm/mach-exynos/lowlevel_init.c | 6 +++--- include/configs/exynos5420-common.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-exynos/lowlevel_init.c +3 -3
@@ -77,10 +77,10 @@ static void low_power_start(void)branch_bx (0x0 ); } - reg_val =readl (CONFIG_PHY_IRAM_BASE +0x4 ); + reg_val =readl (CFG_PHY_IRAM_BASE +0x4 );if (reg_val != (uint32_t )&low_power_start) {/* Store jump address as low_power_start if not present */ -writel ((uint32_t )&low_power_start,CONFIG_PHY_IRAM_BASE +0x4 ); +writel ((uint32_t )&low_power_start,CFG_PHY_IRAM_BASE +0x4 );dsb ();sev (); }
@@ -164,7 +164,7 @@ static void secondary_cores_configure(void)writel ((uint32_t )&low_power_start,CFG_LOWPOWER_ADDR );writel (CPU_RST_FLAG_VAL ,EXYNOS5420_SPARE_BASE );/* Store jump address for power down */ -writel ((uint32_t )&power_down_core,CONFIG_PHY_IRAM_BASE +0x4 ); +writel ((uint32_t )&power_down_core,CFG_PHY_IRAM_BASE +0x4 );/* Need all core power down check */ dsb ();
include/configs/exynos5420-common.h +1 -1
@@ -10,7 +10,7 @@#define CFG_IRAM_TOP 0x02074000 -#define CONFIG_PHY_IRAM_BASE 0x02020000 +#define CFG_PHY_IRAM_BASE 0x02020000/* * Low Power settings
Signature · 1 line
2.25.1
PATCH 99/149 global: Migrate CONFIG_PL011_CLOCK to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_PL011_CLOCK to CFG_PL011_CLOCK
--- README | 2 +- arch/arm/cpu/armv7/s5p4418/cpu.c | 2 +- board/armltd/total_compute/total_compute.c | 2 +- board/armltd/vexpress64/vexpress64.c | 2 +- drivers/serial/serial_pl01x.c | 8 ++++---- include/configs/corstone1000.h | 2 +- include/configs/highbank.h | 2 +- include/configs/lx2160a_common.h | 2 +- include/configs/mxs.h | 2 +- include/configs/s5p4418_nanopi2.h | 2 +- include/configs/synquacer.h | 2 +- include/configs/thunderx_88xx.h | 2 +- include/configs/total_compute.h | 2 +- include/configs/vexpress_aemv8.h | 4 ++-- include/configs/vexpress_common.h | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-)
README +1 -1
@@ -413,7 +413,7 @@ The following options need to be configured: controller register space - Serial Ports: - CONFIG_PL011_CLOCK + CFG_PL011_CLOCK If you have Amba PrimeCell PL011 UARTs, set this variable to the clock speed of the UARTs.
arch/arm/cpu/armv7/s5p4418/cpu.c +1 -1
@@ -64,7 +64,7 @@ static void serial_device_init(void)/* set clock */ clk_disable (clk); -clk_set_rate (clk,CONFIG_PL011_CLOCK ); +clk_set_rate (clk,CFG_PL011_CLOCK ); clk_enable(clk); }#endif
board/armltd/total_compute/total_compute.c +1 -1
@@ -13,7 +13,7 @@static const struct pl01x_serial_plat serial_plat = { .base =UART0_BASE , .type =TYPE_PL011 , - .clock =CONFIG_PL011_CLOCK , + .clock =CFG_PL011_CLOCK , };U_BOOT_DRVINFO (total_compute_serials) = {
board/armltd/vexpress64/vexpress64.c +1 -1
@@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;static const struct pl01x_serial_plat serial_plat = { .base =V2M_UART0 , .type =TYPE_PL011 , - .clock =CONFIG_PL011_CLOCK , + .clock =CFG_PL011_CLOCK , };U_BOOT_DRVINFO (vexpress_serials) = {
drivers/serial/serial_pl01x.c +4 -4
@@ -193,7 +193,7 @@ static void pl01x_serial_init_baud(int baudrate)#if defined(CONFIG_PL011_SERIAL ) pl01x_type =TYPE_PL011 ; - clock =CONFIG_PL011_CLOCK ; + clock =CFG_PL011_CLOCK ;#endif base_regs = (struct pl01x_regs *)port[CONFIG_CONS_INDEX ];
@@ -343,8 +343,8 @@ static const struct udevice_id pl01x_serial_id[] ={ {} }; -#ifndef CONFIG_PL011_CLOCK -#define CONFIG_PL011_CLOCK 0 +#ifndef CFG_PL011_CLOCK +#define CFG_PL011_CLOCK 0#endif int pl01x_serial_of_to_plat (struct udevice *dev)
@@ -359,7 +359,7 @@ int pl01x_serial_of_to_plat(struct udevice *dev)return -EINVAL ; plat->base = addr; - plat->clock =dev_read_u32_default (dev,"clock" ,CONFIG_PL011_CLOCK ); + plat->clock =dev_read_u32_default (dev,"clock" ,CFG_PL011_CLOCK ); ret =clk_get_by_index (dev,0 , &clk);if (!ret) { ret =clk_enable (&clk);
include/configs/corstone1000.h +1 -1
@@ -16,7 +16,7 @@#define V2M_BASE 0x80000000 -#define CONFIG_PL011_CLOCK 50000000 +#define CFG_PL011_CLOCK 50000000/* Physical Memory Map */ #define PHYS_SDRAM_1 (V2M_BASE)
include/configs/highbank.h +1 -1
@@ -8,7 +8,7 @@#define CFG_SYS_BOOTMAPSZ (16 << 20) -#define CONFIG_PL011_CLOCK 150000000 +#define CFG_PL011_CLOCK 150000000/* * Miscellaneous configurable options
include/configs/lx2160a_common.h +1 -1
@@ -39,7 +39,7 @@/* Serial Port */ -#define CONFIG_PL011_CLOCK (get_bus_freq(0) / 4) +#define CFG_PL011_CLOCK (get_bus_freq(0) / 4)#define CFG_SYS_SERIAL0 0x21c0000#define CFG_SYS_SERIAL1 0x21d0000#define CFG_SYS_SERIAL2 0x21e0000
include/configs/mxs.h +1 -1
@@ -77,7 +77,7 @@* DUART Serial Driver. * Conflicts with AUART driver which can be set by board. */ -#define CONFIG_PL011_CLOCK 24000000 +#define CFG_PL011_CLOCK 24000000#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE }/* Default baudrate can be overridden by board! */
include/configs/s5p4418_nanopi2.h +1 -1
@@ -76,7 +76,7 @@/*----------------------------------------------------------------------- * serial console configuration */ -#define CONFIG_PL011_CLOCK 50000000 +#define CFG_PL011_CLOCK 50000000#define CONFIG_PL01x_PORTS {(void *)PHY_BASEADDR_UART0, \ (void *)PHY_BASEADDR_UART1, \ (void *)PHY_BASEADDR_UART2, \
include/configs/synquacer.h +1 -1
@@ -31,7 +31,7 @@/* Serial (pl011) */ #define UART_CLK (62500000) -#define CONFIG_PL011_CLOCK UART_CLK +#define CFG_PL011_CLOCK UART_CLK#define CONFIG_PL01x_PORTS {(void *)(0x2a400000)}/* Support MTD */
include/configs/thunderx_88xx.h +1 -1
@@ -17,7 +17,7 @@/* PL011 Serial Configuration */ -#define CONFIG_PL011_CLOCK 24000000 +#define CFG_PL011_CLOCK 24000000/* Generic Interrupt Controller Definitions */ #define GICD_BASE (0x801000000000)
include/configs/total_compute.h +1 -1
@@ -14,7 +14,7 @@#define UART0_BASE 0x7ff80000/* PL011 Serial Configuration */ -#define CONFIG_PL011_CLOCK 7372800 +#define CFG_PL011_CLOCK 7372800/* Miscellaneous configurable options */
include/configs/vexpress_aemv8.h +2 -2
@@ -86,9 +86,9 @@/* PL011 Serial Configuration */ #ifdef CONFIG_TARGET_VEXPRESS64_JUNO -#define CONFIG_PL011_CLOCK 7372800 +#define CFG_PL011_CLOCK 7372800#else -#define CONFIG_PL011_CLOCK 24000000 +#define CFG_PL011_CLOCK 24000000#endif /* Physical Memory Map */
include/configs/vexpress_common.h +1 -1
@@ -116,7 +116,7 @@#define CFG_SYS_TIMER_COUNTER (V2M_TIMER01 + 0x4)/* PL011 Serial Configuration */ -#define CONFIG_PL011_CLOCK 24000000 +#define CFG_PL011_CLOCK 24000000#define CONFIG_PL01x_PORTS {(void *)CFG_SYS_SERIAL0, \ (void *)CFG_SYS_SERIAL1}
Signature · 1 line
2.25.1
PATCH 100/149 global: Migrate CONFIG_PL01x_PORTS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_PL01x_PORTS to CFG_PL01x_PORTS
--- README | 2 +- drivers/serial/serial_pl01x.c | 2 +- include/configs/lx2160a_common.h | 2 +- include/configs/mxs.h | 2 +- include/configs/s5p4418_nanopi2.h | 2 +- include/configs/synquacer.h | 2 +- include/configs/vexpress_common.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
README +1 -1
@@ -418,7 +418,7 @@ The following options need to be configured: If you have Amba PrimeCell PL011 UARTs, set this variable to the clock speed of the UARTs. - CONFIG_PL01x_PORTS + CFG_PL01x_PORTS If you have Amba PrimeCell PL010 or PL011 UARTs on your board, define this to a list of base addresses for each (supported)
drivers/serial/serial_pl01x.c +1 -1
@@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;#ifndef CONFIG_DM_SERIAL -static volatile unsigned char *const port[] = CONFIG_PL01x_PORTS; +static volatile unsigned char *const port[] = CFG_PL01x_PORTS; static enum pl01x_type pl01x_type __section(".data"); static struct pl01x_regs *base_regs __section(".data");#define NUM_PORTS (sizeof(port)/sizeof(port[0]))
include/configs/lx2160a_common.h +1 -1
@@ -45,7 +45,7 @@#define CFG_SYS_SERIAL2 0x21e0000#define CFG_SYS_SERIAL3 0x21f0000/*below might needs to be removed*/ -#define CONFIG_PL01x_PORTS {(void *)CFG_SYS_SERIAL0, \ +#define CFG_PL01x_PORTS {(void *)CFG_SYS_SERIAL0, \ (void *)CFG_SYS_SERIAL1, \ (void *)CFG_SYS_SERIAL2, \ (void *)CFG_SYS_SERIAL3 }
include/configs/mxs.h +1 -1
@@ -78,7 +78,7 @@* Conflicts with AUART driver which can be set by board. */ #define CFG_PL011_CLOCK 24000000 -#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE } +#define CFG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE }/* Default baudrate can be overridden by board! */ /* NAND */
include/configs/s5p4418_nanopi2.h +1 -1
@@ -77,7 +77,7 @@* serial console configuration */ #define CFG_PL011_CLOCK 50000000 -#define CONFIG_PL01x_PORTS {(void *)PHY_BASEADDR_UART0, \ +#define CFG_PL01x_PORTS {(void *)PHY_BASEADDR_UART0, \ (void *)PHY_BASEADDR_UART1, \ (void *)PHY_BASEADDR_UART2, \ (void *)PHY_BASEADDR_UART3}
include/configs/synquacer.h +1 -1
@@ -32,7 +32,7 @@/* Serial (pl011) */ #define UART_CLK (62500000)#define CFG_PL011_CLOCK UART_CLK -#define CONFIG_PL01x_PORTS {(void *)(0x2a400000)} +#define CFG_PL01x_PORTS {(void *)(0x2a400000)}/* Support MTD */ #define CFG_SYS_FLASH_BASE (0x08000000)
include/configs/vexpress_common.h +1 -1
@@ -117,7 +117,7 @@/* PL011 Serial Configuration */ #define CFG_PL011_CLOCK 24000000 -#define CONFIG_PL01x_PORTS {(void *)CFG_SYS_SERIAL0, \ +#define CFG_PL01x_PORTS {(void *)CFG_SYS_SERIAL0, \ (void *)CFG_SYS_SERIAL1}#define CFG_SYS_SERIAL0 V2M_UART0
Signature · 1 line
2.25.1
PATCH 101/149 global: Migrate CONFIG_PME_PLAT_CLK_DIV to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_PME_PLAT_CLK_DIV to CFG_PME_PLAT_CLK_DIV
--- arch/powerpc/cpu/mpc85xx/speed.c | 6 +++--- arch/powerpc/include/asm/config_mpc85xx.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
arch/powerpc/cpu/mpc85xx/speed.c +3 -3
@@ -67,7 +67,7 @@ void get_sys_info(sys_info_t *sys_info) [14] = 4, /* CC4 PPL / 4 */ };uint i, freq_c_pll[CONFIG_SYS_FSL_NUM_CC_PLLS ]; -#if !defined(CFG_FM_PLAT_CLK_DIV ) || !defined(CONFIG_PME_PLAT_CLK_DIV ) +#if !defined(CFG_FM_PLAT_CLK_DIV ) || !defined(CFG_PME_PLAT_CLK_DIV )uint rcw_tmp;#endif uint ratio[CONFIG_SYS_FSL_NUM_CC_PLLS ];
@@ -206,7 +206,7 @@ void get_sys_info(sys_info_t *sys_info)#define FM1_CLK_SEL 0x1c000000#define FM1_CLK_SHIFT 26#endif -#if !defined(CFG_FM_PLAT_CLK_DIV ) || !defined(CONFIG_PME_PLAT_CLK_DIV ) +#if !defined(CFG_FM_PLAT_CLK_DIV ) || !defined(CFG_PME_PLAT_CLK_DIV )#if defined(CONFIG_ARCH_T1024 ) rcw_tmp =in_be32 (&gur->rcwsr[15 ]) -4 ;#else
@@ -215,7 +215,7 @@ void get_sys_info(sys_info_t *sys_info)#endif #ifdef CONFIG_SYS_DPAA_PME -#ifndef CONFIG_PME_PLAT_CLK_DIV +#ifndef CFG_PME_PLAT_CLK_DIV switch ((rcw_tmp & PME_CLK_SEL) >> PME_CLK_SHIFT) { case 1: sys_info->freq_pme = freq_c_pll[CFG_SYS_PME_CLK];
arch/powerpc/include/asm/config_mpc85xx.h +4 -4
@@ -144,8 +144,8 @@#define CONFIG_SYS_FSL_SRDS_1 #define CFG_SYS_NUM_FMAN 1#define CFG_SYS_NUM_FM1_DTSEC 5 -#define CONFIG_PME_PLAT_CLK_DIV 2 -#define CFG_SYS_PME_CLK CONFIG_PME_PLAT_CLK_DIV +#define CFG_PME_PLAT_CLK_DIV 2 +#define CFG_SYS_PME_CLK CFG_PME_PLAT_CLK_DIV#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8#define CFG_FM_PLAT_CLK_DIV 1#define CFG_SYS_FM1_CLK CFG_FM_PLAT_CLK_DIV
@@ -182,8 +182,8 @@#define CFG_SYS_FSL_SRIO_OB_WIN_NUM 9#define CFG_SYS_FSL_SRIO_IB_WIN_NUM 5#endif -#define CONFIG_PME_PLAT_CLK_DIV 1 -#define CFG_SYS_PME_CLK CONFIG_PME_PLAT_CLK_DIV +#define CFG_PME_PLAT_CLK_DIV 1 +#define CFG_SYS_PME_CLK CFG_PME_PLAT_CLK_DIV#define CFG_SYS_FM1_CLK 0#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8#define CFG_SYS_FM_MURAM_SIZE 0x28000
Signature · 1 line
2.25.1
PATCH 102/149 global: Migrate CONFIG_POSTBOOTMENU to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_POSTBOOTMENU to CFG_POSTBOOTMENU
--- cmd/bootmenu.c | 4 ++-- include/configs/nokia_rx51.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
cmd/bootmenu.c +2 -2
@@ -577,8 +577,8 @@ cleanup:free (command); } -#ifdef CONFIG_POSTBOOTMENU -run_command (CONFIG_POSTBOOTMENU ,0 ); +#ifdef CFG_POSTBOOTMENU +run_command (CFG_POSTBOOTMENU ,0 );#endif if (efi_ret !=EFI_SUCCESS || cmd_ret !=CMD_RET_SUCCESS )
include/configs/nokia_rx51.h +1 -1
@@ -128,7 +128,7 @@"bootmenu_delay=30\0" \"" -#define CONFIG_POSTBOOTMENU \ +#define CFG_POSTBOOTMENU \"echo;" \"echo Extra commands:;" \"echo run sdboot - Boot from SD card slot.;" \
Signature · 1 line
2.25.1
PATCH 103/149 global: Migrate CONFIG_POWER_LTC3676_I2C_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_POWER_LTC3676_I2C_ADDR to CFG_POWER_LTC3676_I2C_ADDR
--- board/gateworks/gw_ventana/gw_ventana_spl.c | 4 ++-- drivers/power/pmic/pmic_ltc3676.c | 2 +- include/configs/gw_ventana.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
board/gateworks/gw_ventana/gw_ventana_spl.c +2 -2
@@ -851,8 +851,8 @@ void setup_pmic(void) }/* configure LTC3676 PMIC */ -else if (!i2c_probe (CONFIG_POWER_LTC3676_I2C_ADDR )) { -debug ("probed LTC3676@0x%x\n" ,CONFIG_POWER_LTC3676_I2C_ADDR ); +else if (!i2c_probe (CFG_POWER_LTC3676_I2C_ADDR )) { +debug ("probed LTC3676@0x%x\n" ,CFG_POWER_LTC3676_I2C_ADDR );power_ltc3676_init (i2c_pmic); p =pmic_get ("LTC3676_PMIC" );if (!p ||pmic_probe (p))
drivers/power/pmic/pmic_ltc3676.c +1 -1
@@ -23,7 +23,7 @@ int power_ltc3676_init(unsigned char bus) p->name = name; p->interface =PMIC_I2C ; p->number_of_regs =LTC3676_NUM_OF_REGS ; - p->hw.i2c.addr =CONFIG_POWER_LTC3676_I2C_ADDR ; + p->hw.i2c.addr =CFG_POWER_LTC3676_I2C_ADDR ; p->hw.i2c.tx_num =1 ; p->bus = bus;
include/configs/gw_ventana.h +1 -1
@@ -31,7 +31,7 @@* PMIC */ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 -#define CONFIG_POWER_LTC3676_I2C_ADDR 0x3c +#define CFG_POWER_LTC3676_I2C_ADDR 0x3c/* Various command support */
Signature · 1 line
2.25.1
PATCH 104/149 global: Migrate CONFIG_POWER_PFUZE100_I2C_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_POWER_PFUZE100_I2C_ADDR to CFG_POWER_PFUZE100_I2C_ADDR
--- board/gateworks/gw_ventana/gw_ventana_spl.c | 4 ++-- drivers/power/pmic/pmic_pfuze100.c | 2 +- include/configs/el6x_common.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/mx6sabreauto.h | 2 +- include/configs/mx6sabresd.h | 2 +- include/configs/novena.h | 2 +- include/configs/tqma6.h | 2 +- include/configs/vining_2000.h | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-)
board/gateworks/gw_ventana/gw_ventana_spl.c +2 -2
@@ -791,8 +791,8 @@ void setup_pmic(void)i2c_set_bus_num (i2c_pmic);/* configure PFUZE100 PMIC */ -if (!i2c_probe (CONFIG_POWER_PFUZE100_I2C_ADDR )) { -debug ("probed PFUZE100@0x%x\n" ,CONFIG_POWER_PFUZE100_I2C_ADDR ); +if (!i2c_probe (CFG_POWER_PFUZE100_I2C_ADDR )) { +debug ("probed PFUZE100@0x%x\n" ,CFG_POWER_PFUZE100_I2C_ADDR );power_pfuze100_init (i2c_pmic); p =pmic_get ("PFUZE100" );if (p && !pmic_probe (p)) {
drivers/power/pmic/pmic_pfuze100.c +1 -1
@@ -23,7 +23,7 @@ int power_pfuze100_init(unsigned char bus) p->name = name; p->interface =PMIC_I2C ; p->number_of_regs =PFUZE100_NUM_OF_REGS ; - p->hw.i2c.addr =CONFIG_POWER_PFUZE100_I2C_ADDR ; + p->hw.i2c.addr =CFG_POWER_PFUZE100_I2C_ADDR ; p->hw.i2c.tx_num =1 ; p->bus = bus;
include/configs/el6x_common.h +1 -1
@@ -17,7 +17,7 @@#define CFG_SYS_FSL_USDHC_NUM 2/* PMIC */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08/* Commands */
include/configs/gw_ventana.h +1 -1
@@ -30,7 +30,7 @@/* * PMIC */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08#define CFG_POWER_LTC3676_I2C_ADDR 0x3c/* Various command support */
include/configs/imx8mq_evk.h +1 -1
@@ -18,7 +18,7 @@#define CFG_MALLOC_F_ADDR 0x182000/* For RAW image gives a error info not panic */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08#endif /* ENET Config */
include/configs/kontron_pitx_imx8m.h +1 -1
@@ -20,7 +20,7 @@/* For RAW image gives a error info not panic */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08#endif /* ENET1 Config */
include/configs/mx6sabreauto.h +1 -1
@@ -36,6 +36,6 @@/* DMA stuff, needed for GPMI/MXS NAND support */ /* PMIC */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08#endif /* __MX6SABREAUTO_CONFIG_H */
include/configs/mx6sabresd.h +1 -1
@@ -25,7 +25,7 @@#endif /* PMIC */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08/* USB Configs */ #ifdef CONFIG_CMD_USB
include/configs/novena.h +1 -1
@@ -46,7 +46,7 @@#endif /* PMIC */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08/* UART */ #define CFG_MXC_UART_BASE UART2_BASE
include/configs/tqma6.h +1 -1
@@ -31,7 +31,7 @@#define CFG_I2C_MULTI_BUS #if !defined(CONFIG_DM_PMIC ) -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08#define TQMA6_PFUZE100_I2C_BUS 2#endif
include/configs/vining_2000.h +1 -1
@@ -31,7 +31,7 @@#define CFG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR/* PMIC */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08/* Network */ #define CFG_FEC_MXC_PHYADDR 0x0
Signature · 1 line
2.25.1
PATCH 105/149 global: Migrate CONFIG_POWER_PFUZE3000_I2C_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_POWER_PFUZE3000_I2C_ADDR to CFG_POWER_PFUZE3000_I2C_ADDR
--- drivers/power/pmic/pmic_pfuze3000.c | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/pico-imx7d.h | 2 +- include/configs/udoo_neo.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/power/pmic/pmic_pfuze3000.c +1 -1
@@ -23,7 +23,7 @@ int power_pfuze3000_init(unsigned char bus) p->name = name; p->interface =PMIC_I2C ; p->number_of_regs =PFUZE3000_NUM_OF_REGS ; - p->hw.i2c.addr =CONFIG_POWER_PFUZE3000_I2C_ADDR ; + p->hw.i2c.addr =CFG_POWER_PFUZE3000_I2C_ADDR ; p->hw.i2c.tx_num =1 ; p->bus = bus;
include/configs/cl-som-imx7.h +1 -1
@@ -19,7 +19,7 @@#define IMX_FEC_BASE ENET_IPS_BASE_ADDR/* PMIC */ -#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE3000_I2C_ADDR 0x08#define CFG_SYS_I2C_PCA953X_ADDR 0x20#define CFG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} }
include/configs/pico-imx7d.h +1 -1
@@ -98,7 +98,7 @@#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE/* PMIC */ -#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE3000_I2C_ADDR 0x08/* FLASH and environment organization */
include/configs/udoo_neo.h +1 -1
@@ -62,7 +62,7 @@#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE/* PMIC */ -#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE3000_I2C_ADDR 0x08#define PFUZE3000_I2C_BUS 0#endif /* __CONFIG_H */
Signature · 1 line
2.25.1
PATCH 106/149 global: Migrate CONFIG_PRAM to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_PRAM to CFG_PRAM
--- README | 4 ++-- common/board_f.c | 8 ++++---- common/board_r.c | 6 +++--- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5249EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/km/km-powerpc.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/kmcent2.h | 2 +- include/configs/nokia_rx51.h | 2 +- include/configs/stmark2.h | 2 +- include/configs/ti_omap5_common.h | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-)
README +2 -2
@@ -1069,11 +1069,11 @@ The following options need to be configured: or define CFG_ENV_FLAGS_LIST_STATIC. - Protected RAM: - CONFIG_PRAM + CFG_PRAM Define this variable to enable the reservation of "protected RAM", i. e. RAM which is not overwritten - by U-Boot. Define CONFIG_PRAM to hold the number of + by U-Boot. Define CFG_PRAM to hold the number of kB you want to reserve for pRAM. You can overwrite this default value by defining an environment variable "pram" to the number of kB you want to
common/board_f.c +4 -4
@@ -380,19 +380,19 @@ static int setup_dest_addr(void)return arch_setup_dest_addr (); } -#ifdef CONFIG_PRAM +#ifdef CFG_PRAM /* reserve protected RAM */ static int reserve_pram (void ) {ulong reg; - reg =env_get_ulong ("pram" ,10 ,CONFIG_PRAM ); + reg =env_get_ulong ("pram" ,10 ,CFG_PRAM ); gd->relocaddr -= (reg <<10 );/* size is in kB */ debug ("Reserving %ldk for protected RAM at %08lx\n" , reg, gd->relocaddr);return 0 ; } -#endif /* CONFIG_PRAM */ +#endif /* CFG_PRAM */ /* Round memory pointer down to next 4 kB limit */ static int reserve_round_4k (void )
@@ -925,7 +925,7 @@ static const init_fnc_t init_sequence_f[] = {#ifdef CONFIG_OF_BOARD_FIXUP fix_fdt,#endif -#ifdef CONFIG_PRAM +#ifdef CFG_PRAM reserve_pram, #endif reserve_round_4k,
common/board_r.c +3 -3
@@ -533,7 +533,7 @@ static int initr_ide(void) }#endif -#if defined(CONFIG_PRAM ) +#if defined(CFG_PRAM )/* * Export available size of memory for Linux, taking into account the * protected RAM at top of memory
@@ -543,7 +543,7 @@ int initr_mem(void)ulong pram =0 ;char memsz[32 ]; - pram =env_get_ulong ("pram" ,10 ,CONFIG_PRAM ); + pram =env_get_ulong ("pram" ,10 ,CFG_PRAM );sprintf (memsz,"%ldk" , (long int )((gd->ram_size /1024 ) - pram));env_set ("mem" , memsz);
@@ -791,7 +791,7 @@ static init_fnc_t init_sequence_r[] = {*/ last_stage_init,#endif -#if defined(CONFIG_PRAM ) +#if defined(CFG_PRAM ) initr_mem, #endif run_main_loop,
include/configs/M5208EVBE.h +1 -1
@@ -29,7 +29,7 @@"save\0" \ "" -#define CONFIG_PRAM 512/* 512 KB */ +#define CFG_PRAM 512/* 512 KB */ #define CFG_SYS_CLK 166666666/* CPU Core Clock */ #define CFG_SYS_PLL_ODR 0x36
include/configs/M5235EVB.h +1 -1
@@ -39,7 +39,7 @@"save\0" \ "" -#define CONFIG_PRAM 512/* 512 KB */ +#define CFG_PRAM 512/* 512 KB */ #define CFG_SYS_CLK 75000000#define CFG_SYS_CPU_CLK CFG_SYS_CLK * 2
include/configs/M5249EVB.h +1 -1
@@ -57,7 +57,7 @@#define CFG_SYS_FLASH_BASE (CFG_SYS_CS0_BASE)#if 0 /* test-only */ -#define CONFIG_PRAM 512/* test-only for SDRAM problem!!!!!!!!!!!!!!!!!!!! */ +#define CFG_PRAM 512/* test-only for SDRAM problem!!!!!!!!!!!!!!!!!!!! */ #endif /*
include/configs/M53017EVB.h +1 -1
@@ -42,7 +42,7 @@"save\0" \ "" -#define CONFIG_PRAM 512/* 512 KB */ +#define CFG_PRAM 512/* 512 KB */ #define CFG_SYS_CLK 80000000#define CFG_SYS_CPU_CLK CFG_SYS_CLK * 3
include/configs/M5329EVB.h +1 -1
@@ -34,7 +34,7 @@"save\0" \ "" -#define CONFIG_PRAM 512/* 512 KB */ +#define CFG_PRAM 512/* 512 KB */ #define CFG_SYS_CLK 80000000#define CFG_SYS_CPU_CLK CFG_SYS_CLK * 3
include/configs/M5373EVB.h +1 -1
@@ -36,7 +36,7 @@"save\0" \ "" -#define CONFIG_PRAM 512/* 512 KB */ +#define CFG_PRAM 512/* 512 KB */ #define CFG_SYS_CLK 80000000#define CFG_SYS_CPU_CLK CFG_SYS_CLK * 3
include/configs/am43xx_evm.h +1 -1
@@ -152,7 +152,7 @@#if defined(CONFIG_TI_SECURE_DEVICE )/* Avoid relocating onto firewalled area at end of DRAM */ -#define CONFIG_PRAM (64 * 1024) +#define CFG_PRAM (64 * 1024)#endif /* CONFIG_TI_SECURE_DEVICE */ #endif /* __CONFIG_AM43XX_EVM_H */
include/configs/km/km-powerpc.h +1 -1
@@ -25,7 +25,7 @@/* set the default PRAM value to at least PNVRAM + PHRAM when pram env variable * is not valid yet, which is the case for when u-boot copies itself to RAM */ -#define CONFIG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10) +#define CFG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)/* architecture specific default bootargs */ #define CFG_KM_DEF_BOOT_ARGS_CPU ""
include/configs/km/pg-wcom-ls102xa.h +1 -1
@@ -12,7 +12,7 @@#define CFG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR#define CFG_SYS_INIT_RAM_SIZE OCRAM_SIZE -#define CONFIG_PRAM ((CONFIG_KM_PNVRAM + \ +#define CFG_PRAM ((CONFIG_KM_PNVRAM + \ CONFIG_KM_PHRAM + \ CONFIG_KM_RESERVED_PRAM) >> 10)
include/configs/kmcent2.h +1 -1
@@ -181,7 +181,7 @@/* set the default PRAM value to at least PNVRAM + PHRAM when pram env variable * is not valid yet, which is the case for when u-boot copies itself to RAM */ -#define CONFIG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM) >> 10) +#define CFG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM) >> 10)/* * IFC Definitions
include/configs/nokia_rx51.h +1 -1
@@ -169,6 +169,6 @@#define KERNEL_ADDRESS (SDRAM_END-KERNEL_MAXSIZE)/* Reserve protected RAM for attached kernel */ -#define CONFIG_PRAM ((KERNEL_MAXSIZE >> 10)+1) +#define CFG_PRAM ((KERNEL_MAXSIZE >> 10)+1)#endif /* __CONFIG_H */
include/configs/stmark2.h +1 -1
@@ -36,7 +36,7 @@/* Input, PCI, Flexbus, and VCO */ -#define CONFIG_PRAM 2048/* 2048 KB */ +#define CFG_PRAM 2048/* 2048 KB */ #define CFG_SYS_MBAR 0xFC000000
include/configs/ti_omap5_common.h +1 -1
@@ -279,7 +279,7 @@* firewall violation, we tell u-boot that memory is protected RAM (PRAM) */ #if (CONFIG_TI_SECURE_EMIF_REGION_START ==0 ) -#define CONFIG_PRAM (CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE) >> 10 +#define CFG_PRAM (CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE) >> 10#endif #else /*
Signature · 1 line
2.25.1
PATCH 107/149 global: Migrate CONFIG_QBMAN_CLK_DIV to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_QBMAN_CLK_DIV to CFG_QBMAN_CLK_DIV
--- arch/powerpc/cpu/mpc85xx/speed.c | 6 +++--- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/cpu/mpc85xx/speed.c +3 -3
@@ -249,10 +249,10 @@ void get_sys_info(sys_info_t *sys_info)#endif #ifdef CONFIG_SYS_DPAA_QBMAN -#ifndef CONFIG_QBMAN_CLK_DIV -#define CONFIG_QBMAN_CLK_DIV 2 +#ifndef CFG_QBMAN_CLK_DIV +#define CFG_QBMAN_CLK_DIV 2#endif - sys_info->freq_qman = sys_info->freq_systembus /CONFIG_QBMAN_CLK_DIV ; + sys_info->freq_qman = sys_info->freq_systembus /CFG_QBMAN_CLK_DIV ;#endif #if defined(CONFIG_SYS_MAPLE )
arch/powerpc/include/asm/config_mpc85xx.h +1 -1
@@ -163,7 +163,7 @@#define CFG_SYS_NUM_FM1_10GEC 1#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8#define CFG_SYS_FM1_CLK 0 -#define CONFIG_QBMAN_CLK_DIV 1 +#define CFG_QBMAN_CLK_DIV 1#define CFG_SYS_FM_MURAM_SIZE 0x30000#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE #define QE_MURAM_SIZE 0x6000UL
Signature · 1 line
2.25.1
PATCH 108/149 global: Migrate CONFIG_RAMDISK_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_RAMDISK_ADDR to CFG_RAMDISK_ADDR
--- cmd/qfw.c | 4 ++-- doc/usage/cmd/qfw.rst | 2 +- include/configs/x86-common.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
cmd/qfw.c +2 -2
@@ -130,8 +130,8 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag, env =env_get ("ramdiskaddr" ); initrd_addr = env ? (void *)hextoul (env,NULL ) : -#ifdef CONFIG_RAMDISK_ADDR - (void *)CONFIG_RAMDISK_ADDR; +#ifdef CFG_RAMDISK_ADDR + (void *)CFG_RAMDISK_ADDR;#else NULL ;#endif
doc/usage/cmd/qfw.rst +1 -1
@@ -31,7 +31,7 @@ kernel_addr initrd_addr address to which the file specified by the -initrd parameter of QEMU shall be loaded. Defaults to environment variable *ramdiskaddr* and further to - the value of *CONFIG_RAMDISK_ADDR*. + the value of *CFG_RAMDISK_ADDR*. Examples --------
include/configs/x86-common.h +1 -1
@@ -25,7 +25,7 @@*/ /* Default environment */ -#define CONFIG_RAMDISK_ADDR 0x4000000 +#define CFG_RAMDISK_ADDR 0x4000000#if defined(CONFIG_GENERATE_ACPI_TABLE ) || defined(CONFIG_EFI_STUB )#define CFG_OTHBOOTARGS "othbootargs=\0"#else
Signature · 1 line
2.25.1
PATCH 109/149 global: Migrate CONFIG_RESET_VECTOR_ADDRESS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_RESET_VECTOR_ADDRESS to CFG_RESET_VECTOR_ADDRESS
--- arch/powerpc/cpu/mpc85xx/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/u-boot.lds | 4 ++-- arch/powerpc/dts/kmcent2-u-boot.dtsi | 2 +- arch/powerpc/dts/u-boot.dtsi | 6 +++--- board/freescale/p1_p2_rdb_pc/README | 2 +- board/freescale/p2041rdb/README | 2 +- board/freescale/t104xrdb/README | 2 +- board/freescale/t208xqds/README | 2 +- board/freescale/t208xrdb/README | 2 +- include/configs/P1010RDB.h | 8 ++++---- include/configs/P2041RDB.h | 8 ++++---- include/configs/T102xRDB.h | 10 +++++----- include/configs/T104xRDB.h | 8 ++++---- include/configs/T208xQDS.h | 10 +++++----- include/configs/T208xRDB.h | 10 +++++----- include/configs/T4240RDB.h | 8 ++++---- include/configs/kmcent2.h | 2 +- include/configs/p1_p2_rdb_pc.h | 4 ++-- 18 files changed, 46 insertions(+), 46 deletions(-)
arch/powerpc/cpu/mpc85xx/Kconfig +1 -1
@@ -931,7 +931,7 @@ config ARCH_T4240 imply FSL_SATA config MPC85XX_HAVE_RESET_VECTOR - bool "Indicate reset vector at CONFIG_RESET_VECTOR_ADDRESS - 0xffc" + bool "Indicate reset vector at CFG_RESET_VECTOR_ADDRESS - 0xffc" depends on MPC85xx config BTB
arch/powerpc/cpu/mpc85xx/u-boot.lds +2 -2
@@ -5,8 +5,8 @@ #include "config.h" -#ifdef CONFIG_RESET_VECTOR_ADDRESS -#define RESET_VECTOR_ADDRESS CONFIG_RESET_VECTOR_ADDRESS +#ifdef CFG_RESET_VECTOR_ADDRESS +#define RESET_VECTOR_ADDRESS CFG_RESET_VECTOR_ADDRESS #else #define RESET_VECTOR_ADDRESS 0xfffffffc #endif
arch/powerpc/dts/kmcent2-u-boot.dtsi +1 -1
@@ -91,7 +91,7 @@ align = <256>; }; powerpc-mpc85xx-bootpg-resetvec { - offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>; + offset = <(CFG_RESET_VECTOR_ADDRESS - 0xffc)>; }; }; };
arch/powerpc/dts/u-boot.dtsi +3 -3
@@ -23,11 +23,11 @@ u-boot-dtb-with-ucode { align = <4>; }; -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc #endif powerpc-mpc85xx-bootpg-resetvec { - offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>; + offset = <(CFG_RESET_VECTOR_ADDRESS - 0xffc)>; }; }; };
board/freescale/p1_p2_rdb_pc/README +1 -1
@@ -57,7 +57,7 @@ enabled in relative defconfig file, 1. CONFIG_DEFAULT_DEVICE_TREE="p1020rdb" (Change default device tree name if required) 2. CONFIG_OF_CONTROL 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at - CONFIG_RESET_VECTOR_ADDRESS - 0xffc + CFG_RESET_VECTOR_ADDRESS - 0xffc If device tree support is enabled in defconfig, 1. use 'u-boot.bin' for NOR boot.
board/freescale/p2041rdb/README +1 -1
@@ -98,7 +98,7 @@ enabled in relative defconfig file, 1. CONFIG_DEFAULT_DEVICE_TREE="p2041rdb" (Change default device tree name if required) 2. CONFIG_OF_CONTROL 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at - CONFIG_RESET_VECTOR_ADDRESS - 0xffc + CFG_RESET_VECTOR_ADDRESS - 0xffc CPLD command ============
board/freescale/t104xrdb/README +1 -1
@@ -379,7 +379,7 @@ enabled in relative defconfig file, 1. CONFIG_DEFAULT_DEVICE_TREE="t1042d4rdb" (Change default device tree name if required) 2. CONFIG_OF_CONTROL 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at - CONFIG_RESET_VECTOR_ADDRESS - 0xffc + CFG_RESET_VECTOR_ADDRESS - 0xffc If device tree support is enabled in defconfig, 1. use 'u-boot.bin' for NOR boot.
board/freescale/t208xqds/README +1 -1
@@ -285,7 +285,7 @@ enabled in relative defconfig file, 1. CONFIG_DEFAULT_DEVICE_TREE="t2080qds" (Change default device tree name if required) 2. CONFIG_OF_CONTROL 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at - CONFIG_RESET_VECTOR_ADDRESS - 0xffc + CFG_RESET_VECTOR_ADDRESS - 0xffc If device tree support is enabled in defconfig, 1. use 'u-boot.bin' for NOR boot.
board/freescale/t208xrdb/README +1 -1
@@ -281,7 +281,7 @@ enabled in relative defconfig file, 1. CONFIG_DEFAULT_DEVICE_TREE="t2080rdb" (Change default device tree name if required) 2. CONFIG_OF_CONTROL 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at - CONFIG_RESET_VECTOR_ADDRESS - 0xffc + CFG_RESET_VECTOR_ADDRESS - 0xffc If device tree support is enabled in defconfig, 1. use 'u-boot.bin' for NOR boot.
include/configs/P1010RDB.h +4 -4
@@ -24,7 +24,7 @@#ifdef CONFIG_SPIFLASH #ifdef CONFIG_NXP_ESBC -#define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc +#define CFG_RESET_VECTOR_ADDRESS 0x110bfffc#else #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (512 << 10)#define CFG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000)
@@ -52,11 +52,11 @@#endif #ifdef CONFIG_NAND_SECBOOT /* NAND Boot */ -#define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc +#define CFG_RESET_VECTOR_ADDRESS 0x110bfffc#endif -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc#endif /* High Level Configuration Options */
include/configs/P2041RDB.h +4 -4
@@ -12,7 +12,7 @@#define __CONFIG_H#ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc#endif #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
@@ -20,13 +20,13 @@#define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)#define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc#endif /* High Level Configuration Options */ -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc#endif #define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS
include/configs/T102xRDB.h +5 -5
@@ -28,7 +28,7 @@#endif #ifdef CONFIG_SPIFLASH -#define CONFIG_RESET_VECTOR_ADDRESS 0x30000FFC +#define CFG_RESET_VECTOR_ADDRESS 0x30000FFC#define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10)#define CFG_SYS_SPI_FLASH_U_BOOT_DST (0x30000000)#define CFG_SYS_SPI_FLASH_U_BOOT_START (0x30000000)
@@ -36,7 +36,7 @@#endif #ifdef CONFIG_SDCARD -#define CONFIG_RESET_VECTOR_ADDRESS 0x30000FFC +#define CFG_RESET_VECTOR_ADDRESS 0x30000FFC#define CFG_SYS_MMC_U_BOOT_SIZE (768 << 10)#define CFG_SYS_MMC_U_BOOT_DST (0x30000000)#define CFG_SYS_MMC_U_BOOT_START (0x30000000)
@@ -45,8 +45,8 @@#endif /* CONFIG_RAMBOOT_PBL */ -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc#endif /*
@@ -87,7 +87,7 @@#define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)#define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc#endif /*
include/configs/T104xRDB.h +4 -4
@@ -29,7 +29,7 @@#endif #ifdef CONFIG_SPIFLASH -#define CONFIG_RESET_VECTOR_ADDRESS 0x30000FFC +#define CFG_RESET_VECTOR_ADDRESS 0x30000FFC#define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10)#define CFG_SYS_SPI_FLASH_U_BOOT_DST (0x30000000)#define CFG_SYS_SPI_FLASH_U_BOOT_START (0x30000000)
@@ -37,7 +37,7 @@#endif #ifdef CONFIG_SDCARD -#define CONFIG_RESET_VECTOR_ADDRESS 0x30000FFC +#define CFG_RESET_VECTOR_ADDRESS 0x30000FFC#define CFG_SYS_MMC_U_BOOT_SIZE (768 << 10)#define CFG_SYS_MMC_U_BOOT_DST (0x30000000)#define CFG_SYS_MMC_U_BOOT_START (0x30000000)
@@ -48,8 +48,8 @@/* High Level Configuration Options */ -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc#endif #define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS
include/configs/T208xQDS.h +5 -5
@@ -30,7 +30,7 @@#endif #ifdef CONFIG_SPIFLASH -#define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC +#define CFG_RESET_VECTOR_ADDRESS 0x200FFC#define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10)#define CFG_SYS_SPI_FLASH_U_BOOT_DST (0x00200000)#define CFG_SYS_SPI_FLASH_U_BOOT_START (0x00200000)
@@ -38,7 +38,7 @@#endif #ifdef CONFIG_SDCARD -#define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC +#define CFG_RESET_VECTOR_ADDRESS 0x200FFC#define CFG_SYS_MMC_U_BOOT_SIZE (768 << 10)#define CFG_SYS_MMC_U_BOOT_DST (0x00200000)#define CFG_SYS_MMC_U_BOOT_START (0x00200000)
@@ -52,11 +52,11 @@#define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)#define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc#endif -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc#endif /*
include/configs/T208xRDB.h +5 -5
@@ -30,7 +30,7 @@#endif #ifdef CONFIG_SPIFLASH -#define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC +#define CFG_RESET_VECTOR_ADDRESS 0x200FFC#define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10)#define CFG_SYS_SPI_FLASH_U_BOOT_DST (0x00200000)#define CFG_SYS_SPI_FLASH_U_BOOT_START (0x00200000)
@@ -38,7 +38,7 @@#endif #ifdef CONFIG_SDCARD -#define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC +#define CFG_RESET_VECTOR_ADDRESS 0x200FFC#define CFG_SYS_MMC_U_BOOT_SIZE (768 << 10)#define CFG_SYS_MMC_U_BOOT_DST (0x00200000)#define CFG_SYS_MMC_U_BOOT_START (0x00200000)
@@ -52,11 +52,11 @@#define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)#define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc#endif -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc#endif /*
include/configs/T4240RDB.h +4 -4
@@ -16,13 +16,13 @@#ifdef CONFIG_RAMBOOT_PBL #ifndef CONFIG_SDCARD -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc#else #define RESET_VECTOR_OFFSET 0x27FFC#define BOOT_PAGE_OFFSET 0x27000#ifdef CONFIG_SDCARD -#define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC +#define CFG_RESET_VECTOR_ADDRESS 0x200FFC#define CFG_SYS_MMC_U_BOOT_SIZE (768 << 10)#define CFG_SYS_MMC_U_BOOT_DST 0x00200000#define CFG_SYS_MMC_U_BOOT_START 0x00200000
@@ -34,8 +34,8 @@/* High Level Configuration Options */ -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc#endif #define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS
include/configs/kmcent2.h +1 -1
@@ -133,7 +133,7 @@/* High Level Configuration Options */ -#define CONFIG_RESET_VECTOR_ADDRESS 0xebfffffc +#define CFG_RESET_VECTOR_ADDRESS 0xebfffffc#define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS
include/configs/p1_p2_rdb_pc.h +2 -2
@@ -105,8 +105,8 @@#endif /* not CONFIG_TPL_BUILD */ #endif -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc#endif #define CFG_SYS_CCSRBAR 0xffe00000
Signature · 1 line
2.25.1
PATCH 110/149 global: Migrate CONFIG_SAR2_REG to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SAR2_REG to CFG_SAR2_REG
--- arch/arm/mach-mvebu/cpu.c | 4 ++-- arch/arm/mach-mvebu/include/mach/soc.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-mvebu/cpu.c +2 -2
@@ -195,7 +195,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq)int i;#if defined(CONFIG_ARMADA_375 ) || defined(CONFIG_ARMADA_MSYS ) - val =readl (CONFIG_SAR2_REG );/* SAR - Sample At Reset */ + val =readl (CFG_SAR2_REG );/* SAR - Sample At Reset */ #else val =readl (CONFIG_SAR_REG );/* SAR - Sample At Reset */ #endif
@@ -205,7 +205,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq)* Shift CPU0 clock frequency select bit from SAR2 register * into correct position */ - freq |= ((readl (CONFIG_SAR2_REG ) &SAR2_CPU_FREQ_MASK ) + freq |= ((readl (CFG_SAR2_REG ) &SAR2_CPU_FREQ_MASK ) >>SAR2_CPU_FREQ_OFFS ) <<3 ;#endif for (i =0 ; sar_freq_tab[i].val !=0xff ; i++) {
arch/arm/mach-mvebu/include/mach/soc.h +3 -3
@@ -135,7 +135,7 @@#if defined(CONFIG_ARMADA_375 )/* SAR values for Armada 375 */ #define CONFIG_SAR_REG (MVEBU_REGISTER(0xe8200)) -#define CONFIG_SAR2_REG (MVEBU_REGISTER(0xe8204)) +#define CFG_SAR2_REG (MVEBU_REGISTER(0xe8204))#define SAR_CPU_FREQ_OFFS 17#define SAR_CPU_FREQ_MASK (0x1f << SAR_CPU_FREQ_OFFS)
@@ -174,7 +174,7 @@#elif defined(CONFIG_ARMADA_MSYS )/* SAR values for MSYS */ #define CONFIG_SAR_REG (MBUS_DFX_BASE + 0xf8200) -#define CONFIG_SAR2_REG (MBUS_DFX_BASE + 0xf8204) +#define CFG_SAR2_REG (MBUS_DFX_BASE + 0xf8204)#define SAR_CPU_FREQ_OFFS 18#define SAR_CPU_FREQ_MASK (0x7 << SAR_CPU_FREQ_OFFS)
@@ -192,7 +192,7 @@#elif defined(CONFIG_ARMADA_XP )/* SAR values for Armada XP */ #define CONFIG_SAR_REG (MVEBU_REGISTER(0x18230)) -#define CONFIG_SAR2_REG (MVEBU_REGISTER(0x18234)) +#define CFG_SAR2_REG (MVEBU_REGISTER(0x18234))#define SAR_CPU_FREQ_OFFS 21#define SAR_CPU_FREQ_MASK (0x7 << SAR_CPU_FREQ_OFFS)
Signature · 1 line
2.25.1
PATCH 111/149 global: Migrate CONFIG_SAR_REG to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SAR_REG to CFG_SAR_REG
--- arch/arm/mach-kirkwood/include/mach/kw88f6281.h | 2 +- arch/arm/mach-kirkwood/include/mach/soc.h | 2 +- arch/arm/mach-mvebu/cpu.c | 4 ++-- arch/arm/mach-mvebu/include/mach/soc.h | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/mach-kirkwood/include/mach/kw88f6281.h +1 -1
@@ -15,7 +15,7 @@#define KW_REGS_PHY_BASE KW88F6281_REGS_PHYS_BASE/* TCLK Core Clock definition */ -#define CFG_SYS_TCLK ((readl(CONFIG_SAR_REG) & BIT(21)) ? \ +#define CFG_SYS_TCLK ((readl(CFG_SAR_REG) & BIT(21)) ? \ 166666667 : 200000000)#endif /* _ASM_ARCH_KW88F6281_H */
arch/arm/mach-kirkwood/include/mach/soc.h +1 -1
@@ -62,7 +62,7 @@#define MVCPU_WIN_ENABLE KWCPU_WIN_ENABLE#define MVCPU_WIN_DISABLE KWCPU_WIN_DISABLE -#define CONFIG_SAR_REG (KW_MPP_BASE + 0x0030) +#define CFG_SAR_REG (KW_MPP_BASE + 0x0030)#if defined (CONFIG_KW88F6281 )#include <asm/arch/kw88f6281.h>
arch/arm/mach-mvebu/cpu.c +2 -2
@@ -83,7 +83,7 @@ u32 get_boot_device(void)/* * Now check the SAR register for the strapped boot-device */ - val =readl (CONFIG_SAR_REG );/* SAR - Sample At Reset */ + val =readl (CFG_SAR_REG );/* SAR - Sample At Reset */ boot_device = (val &BOOT_DEV_SEL_MASK ) >>BOOT_DEV_SEL_OFFS ;debug ("SAR_REG=0x%08x boot_device=0x%x\n" , val, boot_device);switch (boot_device) {
@@ -197,7 +197,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq)#if defined(CONFIG_ARMADA_375 ) || defined(CONFIG_ARMADA_MSYS ) val =readl (CFG_SAR2_REG );/* SAR - Sample At Reset */ #else - val =readl (CONFIG_SAR_REG );/* SAR - Sample At Reset */ + val =readl (CFG_SAR_REG );/* SAR - Sample At Reset */ #endif freq = (val &SAR_CPU_FREQ_MASK ) >>SAR_CPU_FREQ_OFFS ;#if defined(SAR2_CPU_FREQ_MASK )
arch/arm/mach-mvebu/include/mach/soc.h +6 -6
@@ -134,7 +134,7 @@#if defined(CONFIG_ARMADA_375 )/* SAR values for Armada 375 */ -#define CONFIG_SAR_REG (MVEBU_REGISTER(0xe8200)) +#define CFG_SAR_REG (MVEBU_REGISTER(0xe8200))#define CFG_SAR2_REG (MVEBU_REGISTER(0xe8204))#define SAR_CPU_FREQ_OFFS 17
@@ -146,11 +146,11 @@#define BOOT_FROM_UART 0x30#define BOOT_FROM_SPI 0x38 -#define CFG_SYS_TCLK ((readl(CONFIG_SAR_REG) & BIT(20)) ? \ +#define CFG_SYS_TCLK ((readl(CFG_SAR_REG) & BIT(20)) ? \ 200000000 : 166000000)#elif defined(CONFIG_ARMADA_38X )/* SAR values for Armada 38x */ -#define CONFIG_SAR_REG (MVEBU_REGISTER(0x18600)) +#define CFG_SAR_REG (MVEBU_REGISTER(0x18600))#define SAR_CPU_FREQ_OFFS 10#define SAR_CPU_FREQ_MASK (0x1f << SAR_CPU_FREQ_OFFS)
@@ -169,11 +169,11 @@#define BOOT_FROM_MMC 0x30#define BOOT_FROM_MMC_ALT 0x31 -#define CFG_SYS_TCLK ((readl(CONFIG_SAR_REG) & BIT(15)) ? \ +#define CFG_SYS_TCLK ((readl(CFG_SAR_REG) & BIT(15)) ? \ 200000000 : 250000000)#elif defined(CONFIG_ARMADA_MSYS )/* SAR values for MSYS */ -#define CONFIG_SAR_REG (MBUS_DFX_BASE + 0xf8200) +#define CFG_SAR_REG (MBUS_DFX_BASE + 0xf8200)#define CFG_SAR2_REG (MBUS_DFX_BASE + 0xf8204)#define SAR_CPU_FREQ_OFFS 18
@@ -191,7 +191,7 @@#define CFG_SYS_TCLK 200000000/* 200MHz */ #elif defined(CONFIG_ARMADA_XP )/* SAR values for Armada XP */ -#define CONFIG_SAR_REG (MVEBU_REGISTER(0x18230)) +#define CFG_SAR_REG (MVEBU_REGISTER(0x18230))#define CFG_SAR2_REG (MVEBU_REGISTER(0x18234))#define SAR_CPU_FREQ_OFFS 21
Signature · 1 line
2.25.1
PATCH 112/149 global: Migrate CONFIG_SCIF_A to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SCIF_A to CFG_SCIF_A
--- drivers/serial/serial_sh.c | 2 +- drivers/serial/serial_sh.h | 8 ++++---- include/configs/stout.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/serial/serial_sh.c +1 -1
@@ -274,7 +274,7 @@ U_BOOT_DRIVER(serial_sh) = {# error "Default SCIF doesn't set....."#endif -#if defined(CONFIG_SCIF_A ) +#if defined(CFG_SCIF_A )#define SCIF_BASE_PORT PORT_SCIFA#elif defined(CONFIG_SCI )#define SCIF_BASE_PORT PORT_SCI
drivers/serial/serial_sh.h +4 -4
@@ -92,7 +92,7 @@ struct uart_port {# define SCIF_ORER 0x0001/* overrun error bit */ #elif defined(CONFIG_RCAR_GEN2 ) || defined(CONFIG_RCAR_GEN3 ) || \ defined(CONFIG_R7S72100 ) -# if defined(CONFIG_SCIF_A ) +# if defined(CFG_SCIF_A )# define SCIF_ORER 0x0200# else # define SCIF_ORER 0x0001
@@ -164,7 +164,7 @@ struct uart_port {# define SCIF2_TXROOM_MAX 16#elif defined(CONFIG_RCAR_GEN2 )# define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK) -# if defined(CONFIG_SCIF_A ) +# if defined(CFG_SCIF_A )# define SCIF_RFDC_MASK 0x007f# else # define SCIF_RFDC_MASK 0x001f
@@ -380,7 +380,7 @@ SCIF_FNS(SCFDR, 0, 0, 0x1C, 16) SCIF_FNS(SCSPTR, 0, 0, 0x20, 16) SCIF_FNS(DL, 0, 0, 0x30, 16) SCIF_FNS(CKS, 0, 0, 0x34, 16) -#if defined(CONFIG_SCIF_A ) +#if defined(CFG_SCIF_A ) SCIF_FNS(SCLSR, 0, 0, 0x14, 16)#else SCIF_FNS (SCLSR ,0 ,0 ,0x24 ,16 )
@@ -491,7 +491,7 @@ static inline int scbrr_calc(struct uart_port *port, int bps, int clk)#define SCBRR_VALUE (bps, clk) scbrr_calc(port, bps, clk)#elif defined(CONFIG_RCAR_GEN2 )#define DL_VALUE (bps, clk) (clk / bps / 16)/* External Clock */ -#if defined(CONFIG_SCIF_A ) +#if defined(CFG_SCIF_A )#define SCBRR_VALUE (bps, clk) (clk / bps / 16 - 1)/* Internal Clock */ #else #define SCBRR_VALUE (bps, clk) (clk / bps / 32 - 1)/* Internal Clock */
include/configs/stout.h +1 -1
@@ -23,7 +23,7 @@#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)/* SCIF */ -#define CONFIG_SCIF_A +#define CFG_SCIF_A /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0
Signature · 1 line
2.25.1
PATCH 113/149 global: Migrate CONFIG_SCSI_DEV_LIST to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SCSI_DEV_LIST to CFG_SCSI_DEV_LIST
--- drivers/scsi/scsi.c | 4 ++-- include/configs/ls1021aiot.h | 2 +- include/configs/ls1028ardb.h | 2 +- include/configs/ls1043ardb.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/scsi.c +2 -2
@@ -18,8 +18,8 @@#include <dm/uclass-internal.h> #if !defined(CONFIG_DM_SCSI ) -# ifdef CONFIG_SCSI_DEV_LIST -# define SCSI_DEV_LIST CONFIG_SCSI_DEV_LIST +# ifdef CFG_SCSI_DEV_LIST +# define SCSI_DEV_LIST CFG_SCSI_DEV_LIST# else # ifdef CONFIG_SATA_ULI5288
include/configs/ls1021aiot.h +1 -1
@@ -61,7 +61,7 @@#ifndef PCI_DEVICE_ID_FREESCALE_AHCI #define PCI_DEVICE_ID_FREESCALE_AHCI 0x0440#endif -#define CONFIG_SCSI_DEV_LIST {PCI_VENDOR_ID_FREESCALE, \ +#define CFG_SCSI_DEV_LIST {PCI_VENDOR_ID_FREESCALE, \ PCI_DEVICE_ID_FREESCALE_AHCI}/* SPI */
include/configs/ls1028ardb.h +1 -1
@@ -52,7 +52,7 @@/* SATA */ #define SCSI_VEND_ID 0x1b4b#define SCSI_DEV_ID 0x9170 -#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} +#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}/* Initial environment variables */ #ifndef SPL_NO_ENV
include/configs/ls1043ardb.h +1 -1
@@ -203,7 +203,7 @@#ifndef SPL_NO_SATA #define SCSI_VEND_ID 0x1b4b#define SCSI_DEV_ID 0x9170 -#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} +#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}#endif #include <asm/fsl_secure_boot.h>
Signature · 1 line
2.25.1
PATCH 114/149 global: Migrate CONFIG_SC_TIMER_CLK to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SC_TIMER_CLK to CFG_SC_TIMER_CLK
--- arch/arm/mach-imx/syscounter.c | 2 +- include/configs/mx6_common.h | 2 +- include/configs/mx7_common.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-imx/syscounter.c +1 -1
@@ -65,7 +65,7 @@ int timer_init(void)struct sctr_regs *sctr = (struct sctr_regs *)SCTR_BASE_ADDR ;unsigned long val, freq; - freq =CONFIG_SC_TIMER_CLK ; + freq =CFG_SC_TIMER_CLK ; asmvolatile ("mcr p15, 0, %0, c14, c0, 0" : :"r" (freq));writel (freq, &sctr->cntfid0);
include/configs/mx6_common.h +1 -1
@@ -9,7 +9,7 @@#include <linux/stringify.h> #if (defined(CONFIG_MX6UL ) || defined(CONFIG_MX6ULL )) -#define CONFIG_SC_TIMER_CLK 8000000/* 8Mhz */ +#define CFG_SC_TIMER_CLK 8000000/* 8Mhz */ #else #ifndef CONFIG_SYS_L2CACHE_OFF #define CFG_SYS_PL310_BASE L2_PL310_BASE
include/configs/mx7_common.h +1 -1
@@ -14,7 +14,7 @@#include <asm/mach-imx/gpio.h> /* Timer settings */ -#define CONFIG_SC_TIMER_CLK 8000000/* 8Mhz */ +#define CFG_SC_TIMER_CLK 8000000/* 8Mhz */ /* Miscellaneous configurable options */
Signature · 1 line
2.25.1
PATCH 115/149 global: Migrate CONFIG_SET_DFU_ALT_BUF_LEN to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SET_DFU_ALT_BUF_LEN to CFG_SET_DFU_ALT_BUF_LEN
--- board/samsung/common/misc.c | 2 +- include/configs/odroid.h | 2 +- include/configs/odroid_xu3.h | 2 +- 3 files changed, 3 insertions(+), 3 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
@@ -49,7 +49,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
Signature · 1 line
2.25.1
PATCH 116/149 global: Migrate CONFIG_SH_ETHER_ALIGNE_SIZE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SH_ETHER_ALIGNE_SIZE to CFG_SH_ETHER_ALIGNE_SIZE
--- 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 +- 11 files changed, 19 insertions(+), 19 deletions(-)
drivers/net/sh_eth.c +2 -2
@@ -41,7 +41,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
@@ -49,7 +49,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
@@ -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/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
@@ -27,7 +27,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
@@ -27,7 +27,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
@@ -31,7 +31,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 */
Signature · 1 line
2.25.1
PATCH 117/149 global: Migrate CONFIG_SH_ETHER_CACHE_INVALIDATE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SH_ETHER_CACHE_INVALIDATE to CFG_SH_ETHER_CACHE_INVALIDATE
--- 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 +- 10 files changed, 10 insertions(+), 10 deletions(-)
drivers/net/sh_eth.c +1 -1
@@ -46,7 +46,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
@@ -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/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
@@ -26,7 +26,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
@@ -26,7 +26,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
@@ -30,7 +30,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 */
Signature · 1 line
2.25.1
PATCH 118/149 global: Migrate CONFIG_SH_ETHER_CACHE_WRITEBACK to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SH_ETHER_CACHE_WRITEBACK to CFG_SH_ETHER_CACHE_WRITEBACK
--- 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 +- 11 files changed, 11 insertions(+), 11 deletions(-)
README +1 -1
@@ -547,7 +547,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
@@ -37,7 +37,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
@@ -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/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
@@ -25,7 +25,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
@@ -25,7 +25,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
@@ -29,7 +29,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
Signature · 1 line
2.25.1
PATCH 119/149 global: Migrate CONFIG_SH_ETHER_PHY_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SH_ETHER_PHY_ADDR to CFG_SH_ETHER_PHY_ADDR
--- README | 2 +- drivers/net/sh_eth.c | 6 +++--- 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 +- 11 files changed, 13 insertions(+), 13 deletions(-)
README +1 -1
@@ -544,7 +544,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 +3 -3
@@ -33,8 +33,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) && \
@@ -694,7 +694,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
@@ -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/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
@@ -23,7 +23,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
@@ -23,7 +23,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
@@ -27,7 +27,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
Signature · 1 line
2.25.1
PATCH 120/149 global: Migrate CONFIG_SH_ETHER_PHY_MODE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SH_ETHER_PHY_MODE to CFG_SH_ETHER_PHY_MODE
--- 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 +- 9 files changed, 9 insertions(+), 9 deletions(-)
include/configs/alt.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/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
@@ -24,7 +24,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
@@ -24,7 +24,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
@@ -28,7 +28,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
Signature · 1 line
2.25.1
PATCH 121/149 global: Migrate CONFIG_SH_ETHER_USE_PORT to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SH_ETHER_USE_PORT to CFG_SH_ETHER_USE_PORT
--- README | 2 +- drivers/net/sh_eth.c | 6 +++--- 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 +- 11 files changed, 13 insertions(+), 13 deletions(-)
README +1 -1
@@ -541,7 +541,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 +3 -3
@@ -30,8 +30,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"
@@ -693,7 +693,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
@@ -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/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
@@ -22,7 +22,7 @@#define RCAR_GEN2_UBOOT_SDRAM_SIZE (1024u * 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/silk.h +1 -1
@@ -22,7 +22,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/stout.h +1 -1
@@ -26,7 +26,7 @@#define CFG_SCIF_A /* 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
Signature · 1 line
2.25.1
PATCH 122/149 global: Migrate CONFIG_SLIC to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SLIC to CFG_SLIC
--- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- include/configs/p1_p2_rdb_pc.h | 4 ++-- 2 files changed, 3 insertions(+), 3 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
Signature · 1 line
2.25.1
PATCH 123/149 global: Migrate CONFIG_SMP_PEN_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SMP_PEN_ADDR to CFG_SMP_PEN_ADDR
--- 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 +- 7 files changed, 9 insertions(+), 9 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 CONFIG_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
@@ -161,7 +161,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
@@ -68,7 +68,7 @@#define FSL_PCIE_COMPAT "fsl,ls1021a-pcie" -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200#define HWCONFIG_BUFFER_SIZE 256
include/configs/ls1021aqds.h +1 -1
@@ -242,7 +242,7 @@* MMC */ -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200#define HWCONFIG_BUFFER_SIZE 256
include/configs/ls1021atwr.h +1 -1
@@ -133,7 +133,7 @@/* GPIO */ -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200#define HWCONFIG_BUFFER_SIZE 256
Signature · 1 line
2.25.1
PATCH 124/149 global: Migrate CONFIG_STACKBASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_STACKBASE to CFG_STACKBASE
--- 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 +- 5 files changed, 5 insertions(+), 5 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:
Signature · 1 line
2.25.1
PATCH 125/149 global: Migrate CONFIG_STD_DEVICES_SETTINGS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_STD_DEVICES_SETTINGS to CFG_STD_DEVICES_SETTINGS
--- 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 +- 19 files changed, 22 insertions(+), 22 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
@@ -8,7 +8,7 @@#include <configs/x86-common.h> -#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
@@ -12,7 +12,7 @@#define VIDEO_IO_OFFSET 0 -#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
@@ -44,7 +44,7 @@#define CFG_EXTRA_ENV_SETTINGS \ DISTRO_BOOTENV \ - CONFIG_STD_DEVICES_SETTINGS \ + CFG_STD_DEVICES_SETTINGS \ SPLASH_SETTINGS \ "pciconfighost=1\0" \ "netdev=eth0\0" \
Signature · 1 line
2.25.1
PATCH 126/149 global: Migrate CONFIG_SYS_I2C_DIRECT_BUS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_SYS_I2C_DIRECT_BUS to CFG_SYS_I2C_DIRECT_BUS
--- README | 4 ++-- cmd/i2c.c | 4 ++-- drivers/i2c/i2c_core.c | 10 +++++----- include/i2c.h | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-)
README +2 -2
@@ -843,7 +843,7 @@ The following options need to be configured: CFG_SYS_NUM_I2C_BUSES Hold the number of i2c buses you want to use. - CONFIG_SYS_I2C_DIRECT_BUS + CFG_SYS_I2C_DIRECT_BUS define this, if you don't use i2c muxes on your hardware. if CFG_SYS_I2C_MAX_HOPS is not defined or == 0 you can omit this define.
@@ -855,7 +855,7 @@ The following options need to be configured: CFG_SYS_I2C_BUSES hold a list of buses you want to use, only used if - CONFIG_SYS_I2C_DIRECT_BUS is not defined, for example + CFG_SYS_I2C_DIRECT_BUS is not defined, for example a board with CFG_SYS_I2C_MAX_HOPS = 1 and CFG_SYS_NUM_I2C_BUSES = 9:
cmd/i2c.c +2 -2
@@ -1699,7 +1699,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,for (i =0 ; i <CFG_SYS_NUM_I2C_BUSES ; i++) {printf ("Bus %d:\t%s" , i,I2C_ADAP_NR (i)->name); -#ifndef CONFIG_SYS_I2C_DIRECT_BUS +#ifndef CFG_SYS_I2C_DIRECT_BUS int j;for (j =0 ; j <CFG_SYS_I2C_MAX_HOPS ; j++) {
@@ -1735,7 +1735,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,return -1 ; }printf ("Bus %d:\t%s" , i,I2C_ADAP_NR (i)->name); -#ifndef CONFIG_SYS_I2C_DIRECT_BUS +#ifndef CFG_SYS_I2C_DIRECT_BUS int j;for (j =0 ; j <CFG_SYS_I2C_MAX_HOPS ; j++) {if (i2c_bus[i].next_hop[j].chip ==0 )
drivers/i2c/i2c_core.c +5 -5
@@ -33,14 +33,14 @@ struct i2c_adapter *i2c_get_adapter(int index)return i2c_adap_p; } -#if !defined(CONFIG_SYS_I2C_DIRECT_BUS ) +#if !defined(CFG_SYS_I2C_DIRECT_BUS )struct i2c_bus_hose i2c_bus[CFG_SYS_NUM_I2C_BUSES ] =CFG_SYS_I2C_BUSES ;#endif DECLARE_GLOBAL_DATA_PTR ; -#ifndef CONFIG_SYS_I2C_DIRECT_BUS +#ifndef CFG_SYS_I2C_DIRECT_BUS /* * i2c_mux_set() * -------------
@@ -237,7 +237,7 @@ int i2c_set_bus_num(unsigned int bus)if ((bus ==I2C_BUS ) && (I2C_ADAP ->init_done >0 ))return 0 ; -#ifndef CONFIG_SYS_I2C_DIRECT_BUS +#ifndef CFG_SYS_I2C_DIRECT_BUS if (bus >=CFG_SYS_NUM_I2C_BUSES )return -1 ;#endif
@@ -249,7 +249,7 @@ int i2c_set_bus_num(unsigned int bus)return -2 ; } -#ifndef CONFIG_SYS_I2C_DIRECT_BUS +#ifndef CFG_SYS_I2C_DIRECT_BUS i2c_mux_disconnect_all ();#endif
@@ -257,7 +257,7 @@ int i2c_set_bus_num(unsigned int bus)if (I2C_ADAP ->init_done ==0 )i2c_init_bus (bus,I2C_ADAP ->speed,I2C_ADAP ->slaveaddr); -#ifndef CONFIG_SYS_I2C_DIRECT_BUS +#ifndef CFG_SYS_I2C_DIRECT_BUS i2c_mux_set_all ();#endif return 0 ;
include/i2c.h +4 -4
@@ -635,12 +635,12 @@ void i2c_early_init_f(void);#if !defined(CFG_SYS_I2C_MAX_HOPS )/* no muxes used bus = i2c adapters */ -#define CONFIG_SYS_I2C_DIRECT_BUS 1 +#define CFG_SYS_I2C_DIRECT_BUS 1#define CFG_SYS_I2C_MAX_HOPS 0#define CFG_SYS_NUM_I2C_BUSES ll_entry_count(struct i2c_adapter, i2c)#else /* we use i2c muxes */ -#undef CONFIG_SYS_I2C_DIRECT_BUS +#undef CFG_SYS_I2C_DIRECT_BUS#endif /* define the I2C bus number for RTC and DTT if not already done */
@@ -691,7 +691,7 @@ struct i2c_adapter {struct i2c_adapter *i2c_get_adapter (int index); -#ifndef CONFIG_SYS_I2C_DIRECT_BUS +#ifndef CFG_SYS_I2C_DIRECT_BUS struct i2c_mux { int id; char name[16];
@@ -720,7 +720,7 @@ extern struct i2c_bus_hose i2c_bus[];#define I2C_ADAP I2C_ADAP_NR(gd->cur_i2c_bus)#define I2C_ADAP_HWNR (I2C_ADAP->hwadapnr) -#ifndef CONFIG_SYS_I2C_DIRECT_BUS +#ifndef CFG_SYS_I2C_DIRECT_BUS #define I2C_MUX_PCA9540_ID 1#define I2C_MUX_PCA9540 {I2C_MUX_PCA9540_ID, "PCA9540B"}#define I2C_MUX_PCA9542_ID 2
Signature · 1 line
2.25.1
PATCH 127/149 global: Migrate CONFIG_TEGRA_BOARD_STRING to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_TEGRA_BOARD_STRING to CFG_TEGRA_BOARD_STRING
--- 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 +- 22 files changed, 22 insertions(+), 22 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
@@ -11,7 +11,7 @@#include "tegra30-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Beaver" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Beaver"/* Board-specific serial config */ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
include/configs/cardhu.h +1 -1
@@ -11,7 +11,7 @@#include "tegra30-common.h" /* 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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
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 */
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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
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 */
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 */
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 */
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 */
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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
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 CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
Signature · 1 line
2.25.1
PATCH 128/149 global: Migrate CONFIG_TESTPIN_MASK to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_TESTPIN_MASK to CFG_TESTPIN_MASK
--- board/keymile/km83xx/km83xx.c | 2 +- include/configs/kmcoge5ne.h | 2 +- 2 files changed, 2 insertions(+), 2 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
@@ -36,6 +36,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 */
Signature · 1 line
2.25.1
PATCH 129/149 global: Migrate CONFIG_TESTPIN_REG to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_TESTPIN_REG to CFG_TESTPIN_REG
--- board/keymile/km83xx/km83xx.c | 2 +- include/configs/kmcoge5ne.h | 2 +- 2 files changed, 2 insertions(+), 2 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
@@ -35,7 +35,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 */
Signature · 1 line
2.25.1
PATCH 130/149 global: Migrate CONFIG_TSEC_TBICR_SETTINGS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_TSEC_TBICR_SETTINGS to CFG_TSEC_TBICR_SETTINGS
--- drivers/net/tsec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/tsec.c +4 -4
@@ -29,14 +29,14 @@ )/* 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)
@@ -50,7 +50,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
Signature · 1 line
2.25.1
PATCH 131/149 global: Migrate CONFIG_USART_BASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_USART_BASE to CFG_USART_BASE
--- 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 +- 7 files changed, 11 insertions(+), 11 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 */
Signature · 1 line
2.25.1
PATCH 132/149 global: Migrate CONFIG_USART_ID to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_USART_ID to CFG_USART_ID
--- 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 +- 7 files changed, 7 insertions(+), 7 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
Signature · 1 line
2.25.1
PATCH 133/149 global: Migrate CONFIG_USB_ISP1301_I2C_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_USB_ISP1301_I2C_ADDR to CFG_USB_ISP1301_I2C_ADDR
--- drivers/usb/host/ohci-lpc32xx.c | 2 +- include/configs/devkit3250.h | 2 +- 2 files changed, 2 insertions(+), 2 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
Signature · 1 line
2.25.1
PATCH 134/149 global: Migrate CONFIG_VSC7385_IMAGE et al to CFG
In reply to Tom RiniPerform simple renames of:
CONFIG_VSC7385_IMAGE to CFG_VSC7385_IMAGE CONFIG_VSC7385_IMAGE_SIZE to CFG_VSC7385_IMAGE_SIZE
--- 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 +- 4 files changed, 7 insertions(+), 7 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
@@ -42,8 +42,8 @@#ifdef CONFIG_VSC7385_ENET /* 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
@@ -270,7 +270,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
Signature · 1 line
2.25.1
PATCH 135/149 global: Migrate CONFIG_WATCHDOG_PRESC et al to CFG
In reply to Tom RiniPerform simple renames of:
CONFIG_WATCHDOG_PRESC to CFG_WATCHDOG_PRESC
CONFIG_WATCHDOG_RC to CFG_WATCHDOG_RC
--- arch/powerpc/cpu/mpc85xx/cpu.c | 2 +- include/configs/kmcent2.h | 4 ++-- 2 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 (CFG_WATCHDOG_RC )); }void
include/configs/kmcent2.h +2 -2
@@ -375,8 +375,8 @@ int get_scl(void);/* * Hardware Watchdog */ -#define CONFIG_WATCHDOG_PRESC 34/* wdog prescaler 2^(64-34) ~10min */ -#define CONFIG_WATCHDOG_RC WRC_CHIP/* reset chip on watchdog event */ +#define CFG_WATCHDOG_PRESC 34/* wdog prescaler 2^(64-34) ~10min */ +#define CFG_WATCHDOG_RC WRC_CHIP/* reset chip on watchdog event */ /* * For booting Linux, the board info and command line data
Signature · 1 line
2.25.1
PATCH 136/149 global: Migrate CONFIG_X86_MRC_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_X86_MRC_ADDR to CFG_X86_MRC_ADDR
--- arch/x86/cpu/intel_common/mrc.c | 2 +- arch/x86/dts/u-boot.dtsi | 2 +- include/configs/x86-chromebook.h | 2 +- tools/binman/binman.rst | 2 +- 4 files changed, 4 insertions(+), 4 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
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 137/149 global: Migrate CONFIG_X86_REFCODE_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_X86_REFCODE_ADDR to CFG_X86_REFCODE_ADDR
--- arch/x86/cpu/broadwell/refcode.c | 2 +- arch/x86/dts/u-boot.dtsi | 2 +- include/configs/x86-chromebook.h | 2 +- 3 files changed, 3 insertions(+), 3 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
Signature · 1 line
2.25.1
PATCH 138/149 global: Migrate CONFIG_X86_REFCODE_RUN_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_X86_REFCODE_RUN_ADDR to CFG_X86_REFCODE_RUN_ADDR
--- arch/x86/cpu/broadwell/refcode.c | 4 ++-- include/configs/x86-chromebook.h | 2 +- 2 files changed, 3 insertions(+), 3 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
Signature · 1 line
2.25.1
PATCH 139/149 librem5: Rename CONFIG_POWER_BD71837 symbols
In reply to Tom RiniRename the CONFIG_POWER_BD71837_I2C_* symbols to not have the CONFIG prefix and be local to the file they are used in.
--- board/purism/librem5/spl.c | 8 +++++--- include/configs/librem5.h | 4 ---- 2 files changed, 5 insertions(+), 7 deletions(-)
board/purism/librem5/spl.c +5 -3
@@ -322,6 +322,8 @@ void disable_charger_bq25895(void) }#define I2C_PMIC 0 +#define POWER_BD71837_I2C_BUS 0 +#define POWER_BD71837_I2C_ADDR 0x4Bint power_bd71837_init (unsigned char bus) {
@@ -336,7 +338,7 @@ int power_bd71837_init(unsigned char bus) p->name = name; p->interface =I2C_PMIC ; p->number_of_regs =BD718XX_MAX_REGISTER ; - p->hw.i2c.addr =CONFIG_POWER_BD71837_I2C_ADDR ; + p->hw.i2c.addr =POWER_BD71837_I2C_ADDR ; p->hw.i2c.tx_num =1 ; p->bus = bus;
@@ -357,10 +359,10 @@ int power_init_board(void)/* * Init PMIC */ - rv =power_bd71837_init (CONFIG_POWER_BD71837_I2C_BUS ); + rv =power_bd71837_init (POWER_BD71837_I2C_BUS );if (rv) {log_err ("%s: power_bd71837_init(%d) error %d\n" , __func__, -CONFIG_POWER_BD71837_I2C_BUS , rv); +POWER_BD71837_I2C_BUS , rv); goto out; }
include/configs/librem5.h +0 -4
@@ -19,10 +19,6 @@#define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not panic */ -#define CONFIG_POWER_BD71837 -#define CONFIG_POWER_BD71837_I2C_BUS 0 -#define CONFIG_POWER_BD71837_I2C_ADDR 0x4B -#endif /* CONFIG_SPL_BUILD*/ #define CFG_SYS_FSL_USDHC_NUM 2
Signature · 1 line
2.25.1
PATCH 140/149 configs: Remove unused or redundant CONFIG symbols
In reply to Tom RiniA number of CONFIG symbols have crept in that are never referenced in code, so drop them here. Further, we have two symbols being enabled in headers while already enabled correctly in Kconfig, so these lines can also be removed.
--- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 1 + arch/arm/include/asm/arch-fsl-layerscape/config.h | 1 - arch/arm/mach-mvebu/include/mach/config.h | 3 --- include/configs/cgtqmx8.h | 1 - include/configs/imx8mp_rsb3720.h | 9 --------- include/configs/imx8mq_cm.h | 1 - include/configs/imx8mq_evk.h | 1 - include/configs/imx8mq_phanbell.h | 1 - include/configs/imx8qm_mek.h | 1 - include/configs/imx8qxp_mek.h | 1 - include/configs/kontron_pitx_imx8m.h | 1 - include/configs/librem5.h | 6 ------ include/configs/pico-imx8mq.h | 1 - 13 files changed, 1 insertion(+), 27 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +1 -0
@@ -29,6 +29,7 @@ config ARCH_LS1028A select ESBC_HDR_LS if CHAIN_OF_TRUST select FSL_LAYERSCAPE select FSL_LSCH3 + select FSL_TZASC_400 select GICV3 select NXP_LSCH3_2 select SYS_FSL_HAS_CCI400
arch/arm/include/asm/arch-fsl-layerscape/config.h +0 -1
@@ -160,7 +160,6 @@#elif defined(CONFIG_ARCH_LS1028A )#define CFG_SYS_FSL_CLUSTER_CLOCKS { 1, 1 } -#define CONFIG_FSL_TZASC_400 /* TZ Protection Controller Definitions */ #define TZPC_BASE 0x02200000
arch/arm/mach-mvebu/include/mach/config.h +0 -3
@@ -27,7 +27,4 @@#define MV_UART_CONSOLE_BASE MVEBU_UART0_BASE -/* Needed for SPI NOR booting in SPL */ -#define CONFIG_DM_SEQ_ALIAS 1 -#endif /* __MVEBU_CONFIG_H */
include/configs/cgtqmx8.h +0 -1
@@ -12,7 +12,6 @@#include <asm/arch/imx-regs.h> #ifdef CONFIG_SPL_BUILD -#define CONFIG_SERIAL_LPUART_BASE 0x5a060000#define CFG_MALLOC_F_ADDR 0x00120000#endif
include/configs/imx8mp_rsb3720.h +0 -9
@@ -28,12 +28,6 @@* GD_FLG_FULL_MALLOC_INIT \ * set \ */ - - -#if defined(CONFIG_NAND_BOOT ) -#define CONFIG_SPL_NAND_MXS -#endif -#endif /* ENET Config */
@@ -158,9 +152,6 @@#define FSL_FSPI_FLASH_NUM 1#define FSPI0_BASE_ADDR 0x30bb0000#define FSPI0_AMBA_BASE 0x0 -#define CONFIG_FSPI_QUAD_SUPPORT - -#define CONFIG_SYS_FSL_FSPI_AHB #endif #ifdef CONFIG_NAND_MXS
include/configs/imx8mq_cm.h +0 -1
@@ -11,7 +11,6 @@#include <asm/arch/imx-regs.h> #ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CFG_MALLOC_F_ADDR 0x182000
include/configs/imx8mq_evk.h +0 -1
@@ -12,7 +12,6 @@#ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CFG_MALLOC_F_ADDR 0x182000
include/configs/imx8mq_phanbell.h +0 -1
@@ -11,7 +11,6 @@#ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CFG_MALLOC_F_ADDR 0x182000
include/configs/imx8qm_mek.h +0 -1
@@ -11,7 +11,6 @@#include <asm/arch/imx-regs.h> #ifdef CONFIG_SPL_BUILD -#define CONFIG_SERIAL_LPUART_BASE 0x5a060000#define CFG_MALLOC_F_ADDR 0x00120000#endif
include/configs/imx8qxp_mek.h +0 -1
@@ -11,7 +11,6 @@#include <asm/arch/imx-regs.h> #ifdef CONFIG_SPL_BUILD -#define CONFIG_SERIAL_LPUART_BASE 0x5a060000#define CFG_MALLOC_F_ADDR 0x00120000#endif
include/configs/kontron_pitx_imx8m.h +0 -1
@@ -13,7 +13,6 @@ 0x40, 0xd4, 0x5c, 0xca, 0x13, 0x99)#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CFG_MALLOC_F_ADDR 0x182000
include/configs/librem5.h +0 -6
@@ -15,12 +15,6 @@#include <linux/sizes.h> #include <asm/arch/imx-regs.h> -#ifdef CONFIG_SPL_BUILD - -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not panic */ - -#endif /* CONFIG_SPL_BUILD*/ -#define CFG_SYS_FSL_USDHC_NUM 2#define CONSOLE_ON_UART1
include/configs/pico-imx8mq.h +0 -1
@@ -11,7 +11,6 @@#ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CFG_MALLOC_F_ADDR 0x182000
Signature · 1 line
2.25.1
PATCH 141/149 bcmcygnus: Convert CONFIG_IPROC to Kconfig
In reply to Tom RiniSelect this symbol as needed.
--- arch/arm/Kconfig | 4 ++++ arch/arm/include/asm/iproc-common/configs.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-)
arch/arm/Kconfig +4 -0
@@ -599,6 +599,9 @@ config ARM64_SUPPORT_AARCH32 help This ARM64 system supports AArch32 execution state. +config IPROC + bool + config S5P def_bool y if ARCH_EXYNOS || ARCH_S5PC1XX
@@ -704,6 +707,7 @@ config TARGET_BCMCYGNUS bool "Support bcmcygnus" select CPU_V7A select GPIO_EXTRA_HEADER + select IPROC imply BCM_SF2_ETH imply BCM_SF2_ETH_GMAC imply CMD_HASH
arch/arm/include/asm/iproc-common/configs.h +0 -3
@@ -8,9 +8,6 @@#include <linux/stringify.h> -/* Architecture, CPU, chip, etc */ -#define CONFIG_IPROC -/* Memory Info */ #define CFG_SYS_SDRAM_BASE 0x61000000
Signature · 1 line
2.25.1
PATCH 142/149 kbuild: Remove uncmd_spl logic
In reply to Tom RiniAt this point in the conversion there should be no need to have logic to disable some symbol during the SPL build as all symbols should have an SPL counterpart.
The main real changes done here are that we now must make proper use of CONFIG_IS_ENABLED(DM_SERIAL) rather than many of the odd tricks we developed prior to CONFIG_IS_ENABLED() being available.
--- board/freescale/common/i2c_common.c | 2 +- board/freescale/common/i2c_common.h | 2 +- drivers/misc/gsc.c | 2 +- drivers/serial/Makefile | 17 +---------------- drivers/serial/atmel_usart.c | 8 +++----- drivers/serial/serial-uclass.c | 6 +++--- drivers/serial/serial_mtk.c | 3 +-- drivers/serial/serial_pl01x.c | 11 +++-------- drivers/serial/serial_pl01x_internal.h | 2 +- include/config_uncmd_spl.h | 21 --------------------- include/configs/kmcent2.h | 2 +- include/configs/mv-common.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/ti_omap4_common.h | 2 +- include/configs/x530.h | 2 +- include/ns16550.h | 10 +++++----- scripts/Makefile.autoconf | 1 - scripts/Makefile.build | 1 - scripts/Makefile.uncmd_spl | 14 -------------- 19 files changed, 25 insertions(+), 85 deletions(-) delete mode 100644 include/config_uncmd_spl.h delete mode 100644 scripts/Makefile.uncmd_spl
board/freescale/common/i2c_common.c +1 -1
@@ -9,7 +9,7 @@#include <i2c.h> #include "i2c_common.h" -#ifdef CONFIG_DM_I2C +#if CONFIG_IS_ENABLED (DM_I2C )/* If DM is in use, retrieve the chip for the specified bus number */ int fsl_i2c_get_device (int address,int bus,DEVICE_HANDLE_T *dev)
board/freescale/common/i2c_common.h +1 -1
@@ -9,7 +9,7 @@#define __NXP_I2C_COMMON_H__/* Common functionality shared by the I2C drivers for VID and the mux. */ -#ifdef CONFIG_DM_I2C +#if CONFIG_IS_ENABLED (DM_I2C )#define DEVICE_HANDLE_T struct udevice *#define I2C_READ (dev, register, data, length) \
drivers/misc/gsc.c +1 -1
@@ -77,7 +77,7 @@ enum { GSC_SC_RST_CAUSE_MAX = 10, }; -#if (IS_ENABLED(CONFIG_DM_I2C)) +#if CONFIG_IS_ENABLED(DM_I2C) struct gsc_priv { int gscver;
drivers/serial/Makefile +1 -16
@@ -3,30 +3,15 @@ # (C) Copyright 2006-2009 # Wolfgang Denk, DENX Software Engineering, [email protected]. -ifdef CONFIG_SPL_BUILD - -ifeq ($(CONFIG_$(SPL_TPL_)BUILD)$(CONFIG_$(SPL_TPL_)DM_SERIAL),yy) -obj-y += serial-uclass.o -else -obj-y += serial.o -endif - -else - -ifdef CONFIG_DM_SERIAL +ifeq ($(CONFIG_$(SPL_TPL_)DM_SERIAL),y) obj-y += serial-uclass.o else obj-y += serial.o endif -endif - -ifdef CONFIG_DM_SERIAL obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o -else obj-$(CONFIG_PL011_SERIAL) += serial_pl01x.o obj-$(CONFIG_$(SPL_)SYS_NS16550_SERIAL) += serial_ns16550.o -endif obj-$(CONFIG_ALTERA_UART) += altera_uart.o obj-$(CONFIG_ALTERA_JTAG_UART) += altera_jtag_uart.o
drivers/serial/atmel_usart.c +3 -5
@@ -18,7 +18,7 @@#include <linux/delay.h> #include <asm/io.h> -#ifdef CONFIG_DM_SERIAL +#if CONFIG_IS_ENABLED (DM_SERIAL )#include <asm/arch/atmel_serial.h> #endif #include <asm/arch/clk.h>
@@ -28,7 +28,7 @@DECLARE_GLOBAL_DATA_PTR ; -#ifndef CONFIG_DM_SERIAL +#if !CONFIG_IS_ENABLED (DM_SERIAL )static void atmel_serial_setbrg_internal (atmel_usart3_t *usart,int id,int baudrate) {
@@ -133,9 +133,7 @@ __weak struct serial_device *default_serial_console(void) {return &atmel_serial_drv; } -#endif - -#ifdef CONFIG_DM_SERIAL +#else enum serial_clk_type {CLK_TYPE_NORMAL =0 , CLK_TYPE_DBGU,
drivers/serial/serial-uclass.c +3 -3
@@ -407,7 +407,7 @@ void serial_stdio_init(void) { } -#if defined(CONFIG_DM_STDIO ) +#if CONFIG_IS_ENABLED (DM_STDIO )#if CONFIG_IS_ENABLED (SERIAL_PRESENT )static void serial_stub_putc (struct stdio_dev *sdev,const char ch)
@@ -505,7 +505,7 @@ U_BOOT_ENV_CALLBACK(baudrate, on_baudrate);static int serial_post_probe (struct udevice *dev) {struct dm_serial_ops *ops =serial_get_ops (dev); -#ifdef CONFIG_DM_STDIO +#if CONFIG_IS_ENABLED (DM_STDIO )struct serial_dev_priv *upriv =dev_get_uclass_priv (dev);struct stdio_dev sdev;#endif
@@ -540,7 +540,7 @@ static int serial_post_probe(struct udevice *dev)return ret; } -#ifdef CONFIG_DM_STDIO +#if CONFIG_IS_ENABLED (DM_STDIO )if (!(gd->flags &GD_FLG_RELOC ))return 0 ;memset (&sdev,'\0' ,sizeof (sdev));
drivers/serial/serial_mtk.c +1 -2
@@ -173,8 +173,7 @@ static int _mtk_serial_pending(struct mtk_serial_priv *priv, bool input)return (readl (&priv->regs->lsr) &UART_LSR_THRE ) ?0 :1 ; } -#if defined(CONFIG_DM_SERIAL ) && \ - (!defined(CONFIG_SPL_BUILD ) || defined(CONFIG_SPL_DM )) +#if CONFIG_IS_ENABLED (DM_SERIAL )static int mtk_serial_setbrg (struct udevice *dev,int baudrate) {struct mtk_serial_priv *priv =dev_get_priv (dev);
drivers/serial/serial_pl01x.c +3 -8
@@ -27,8 +27,7 @@DECLARE_GLOBAL_DATA_PTR ; -#ifndef CONFIG_DM_SERIAL - +#if !CONFIG_IS_ENABLED (DM_SERIAL )static volatile unsigned char *const port[] = CFG_PL01x_PORTS; static enum pl01x_type pl01x_type __section(".data"); static struct pl01x_regs *base_regs __section(".data");
@@ -186,7 +185,7 @@ static int pl01x_generic_setbrg(struct pl01x_regs *regs, enum pl01x_type type,return 0 ; } -#ifndef CONFIG_DM_SERIAL +#if !CONFIG_IS_ENABLED (DM_SERIAL )static void pl01x_serial_init_baud (int baudrate) {int clock =0 ;
@@ -273,11 +272,7 @@ __weak struct serial_device *default_serial_console(void) {return &pl01x_serial_drv; } - -#endif /* nCONFIG_DM_SERIAL */ - -#ifdef CONFIG_DM_SERIAL - +#else int pl01x_serial_setbrg (struct udevice *dev,int baudrate) {struct pl01x_serial_plat *plat =dev_get_plat (dev);
drivers/serial/serial_pl01x_internal.h +1 -1
@@ -38,7 +38,7 @@ struct pl01x_regs {u32 pl011_cr;/* 0x30 Control register */ }; -#ifdef CONFIG_DM_SERIAL +#if CONFIG_IS_ENABLED (DM_SERIAL )int pl01x_serial_of_to_plat (struct udevice *dev);int pl01x_serial_probe (struct udevice *dev);
include/config_uncmd_spl.h deleted +0 -21
@@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* (C) Copyright 2012 -* Ilya Yanok, [email protected] -*/ - -#ifndef __CONFIG_UNCMD_SPL_H__ -#define __CONFIG_UNCMD_SPL_H__ - -#ifdef CONFIG_SPL_BUILD -/* SPL needs only BOOTP + TFTP so undefine other stuff to save space */ - -#ifndef CONFIG_SPL_DM -#undef CONFIG_DM_SERIAL -#undef CONFIG_DM_I2C -#endif - -#undef CONFIG_DM_STDIO - -#endif /* CONFIG_SPL_BUILD */ -#endif /* __CONFIG_UNCMD_SPL_H__ */
include/configs/kmcent2.h +1 -1
@@ -325,7 +325,7 @@* shorted - index 1 * Retain non-DM serial port for debug purposes. */ -#if !defined(CONFIG_DM_SERIAL ) +#if !CONFIG_IS_ENABLED (DM_SERIAL )#define CFG_SYS_NS16550_CLK (get_bus_freq(0) / 2)#define CFG_SYS_NS16550_COM1 (CFG_SYS_CCSRBAR + 0x11C500)#endif
include/configs/mv-common.h +1 -1
@@ -33,7 +33,7 @@* NS16550 Configuration */ #define CFG_SYS_NS16550_CLK CFG_SYS_TCLK -#if !defined(CONFIG_DM_SERIAL ) +#if !CONFIG_IS_ENABLED (DM_SERIAL )#define CFG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE#endif
include/configs/sunxi-common.h +1 -1
@@ -23,7 +23,7 @@#else #define CFG_SYS_NS16550_CLK 24000000#endif -#ifndef CONFIG_DM_SERIAL +#if !CONFIG_IS_ENABLED (DM_SERIAL )# define CFG_SYS_NS16550_COM1 SUNXI_UART0_BASE# define CFG_SYS_NS16550_COM2 SUNXI_UART1_BASE# define CFG_SYS_NS16550_COM3 SUNXI_UART2_BASE
include/configs/ti_omap4_common.h +1 -1
@@ -28,7 +28,7 @@* Hardware drivers */ #define CFG_SYS_NS16550_CLK 48000000 -#if defined(CONFIG_SPL_BUILD ) || !defined(CONFIG_DM_SERIAL ) +#if !CONFIG_IS_ENABLED (DM_SERIAL )#define CFG_SYS_NS16550_COM3 UART3_BASE#endif
include/configs/x530.h +1 -1
@@ -14,7 +14,7 @@* NS16550 Configuration */ #define CFG_SYS_NS16550_CLK CFG_SYS_TCLK -#if !defined(CONFIG_DM_SERIAL ) +#if !CONFIG_IS_ENABLED (DM_SERIAL )#define CFG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE#endif
include/ns16550.h +5 -5
@@ -26,7 +26,7 @@#include <linux/types.h> -#if defined(CONFIG_DM_SERIAL ) && !defined(CONFIG_SYS_NS16550_REG_SIZE ) +#if CONFIG_IS_ENABLED (DM_SERIAL ) && !defined(CONFIG_SYS_NS16550_REG_SIZE )/* * For driver model we always use one byte per register, and sort out the * differences in the driver
@@ -37,10 +37,10 @@#ifdef CONFIG_NS16550_DYNAMIC #define UART_REG (x) unsigned char x#else -#if !defined(CONFIG_SYS_NS16550_REG_SIZE ) || (CONFIG_SYS_NS16550_REG_SIZE ==0 ) -#error "Please define NS16550 registers size." -#elif defined(CONFIG_SYS_NS16550_MEM32 ) && !defined(CONFIG_DM_SERIAL ) +#if defined(CONFIG_SYS_NS16550_MEM32 ) && !CONFIG_IS_ENABLED (DM_SERIAL )#define UART_REG (x) u32 x +#elif !defined(CONFIG_SYS_NS16550_REG_SIZE ) || (CONFIG_SYS_NS16550_REG_SIZE ==0 ) +#error "Please define NS16550 registers size."#elif (CONFIG_SYS_NS16550_REG_SIZE >0 )#define UART_REG (x) \ unsigned char prepad_##x[CONFIG_SYS_NS16550_REG_SIZE - 1]; \
@@ -113,7 +113,7 @@ struct ns16550 {UART_REG (scr);/* 10*/ UART_REG (ssr);/* 11*/ #endif -#ifdef CONFIG_DM_SERIAL +#if CONFIG_IS_ENABLED (DM_SERIAL )struct ns16550_plat *plat;#endif };
scripts/Makefile.autoconf +0 -1
@@ -113,7 +113,6 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg define filechk_config_h (echo "/* Automatically generated - do not edit */"; \ echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ - echo \#include \<config_uncmd_spl.h\>; \ echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \ echo \#include \<asm/config.h\>; \ echo \#include \<linux/kconfig.h\>; \
scripts/Makefile.build +0 -1
@@ -48,7 +48,6 @@ subdir-ccflags-y := # Modified for U-Boot -include include/config/auto.conf -include $(prefix)/include/autoconf.mk -include scripts/Makefile.uncmd_spl include scripts/Kbuild.include
scripts/Makefile.uncmd_spl deleted +0 -14
@@ -1,14 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# Makefile version of include/config_uncmd_spl.h -# TODO: Invent a better way - -ifdef CONFIG_SPL_BUILD - -ifndef CONFIG_SPL_DM -CONFIG_DM_SERIAL= -CONFIG_DM_I2C= -CONFIG_DM_SPI= -CONFIG_DM_SPI_FLASH= -endif - -endif
Signature · 1 line
2.25.1
PATCH 143/149 checkpatch.pl: Update CONFIG logic in U-Boot section
In reply to Tom RiniNow that all CONFIG symbols are in Kconfig, checkpatch.pl should check for and error on any case of define/undef CONFIG_*.
--- scripts/checkpatch.pl | 8 ++++---- tools/patman/test_checkpatch.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
scripts/checkpatch.pl +4 -4
@@ -2630,10 +2630,10 @@ sub u_boot_line { "strl$1 is preferred over strn$1 because it always produces a nul-terminated string\n" . $herecurr); } - # use defconfig to manage CONFIG_CMD options - if ($line =~ /\+\s*#\s*(define|undef)\s+(CONFIG_CMD\w*)\b/) { - ERROR("DEFINE_CONFIG_CMD", - "All commands are managed by Kconfig\n" . $herecurr); + # use Kconfig for all CONFIG symbols + if ($line =~ /\+\s*#\s*(define|undef)\s+(CONFIG_\w*)\b/) { + ERROR("DEFINE_CONFIG_SYM", + "All CONFIG symbols are managed by Kconfig\n" . $herecurr); } # Don't put common.h and dm.h in header files
tools/patman/test_checkpatch.py +1 -1
@@ -396,7 +396,7 @@ index 0000000..2234c87 """Test for enabling/disabling commands using preprocesor""" pm = PatchMaker() pm.add_line('common/main.c', '#undef CONFIG_CMD_WHICH') - self.check_single_message(pm, 'DEFINE_CONFIG_CMD', 'error') + self.check_single_message(pm, 'DEFINE_CONFIG_SYM', 'error') def test_barred_include_in_hdr(self): """Test for using a barred include in a header file"""
Signature · 1 line
2.25.1
PATCH 144/149 CI: Replace unmigrated symbol test with non-Kconfig introduction test
In reply to Tom RiniNow that all symbols have been migrated to Kconfig, or are part of the CFG namespace we do not need a complex check for unmigrated CONFIG symbols. Any instance of #define (or #undef) or a CONFIG value is wrong, so cause CI to fail.
This test is not as strict as possible yet as we have more symbols that were not previously caught to deal with.
--- .azure-pipelines.yml | 31 ++++++------------------------- .gitlab-ci.yml | 28 +++++----------------------- 2 files changed, 11 insertions(+), 48 deletions(-)
.azure-pipelines.yml +6 -25
@@ -53,37 +53,18 @@ stages: -j$(sysctl -n hw.logicalcpu) displayName: 'Perform tools-only build' - - job: check_for_migrated_symbols_in_board_header - displayName: 'Check for migrated symbols in board header' + - job: check_for_new_CONFIG_symbols_outside_Kconfig + displayName: 'Check for new CONFIG symbols outside Kconfig' pool: vmImage: $(ubuntu_vm) container: image: $(ci_runner_image) options: $(container_option) steps: - - script: | - KSYMLST=`mktemp` - KUSEDLST=`mktemp` - RET=0 - cat `find . -name "Kconfig*"` | \ - sed -n -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ - -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ - | sort -u > $KSYMLST - for CFG in `find include/configs -name "*.h"`; do - (grep '#define[[:blank:]]CONFIG_' $CFG | \ - sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' ; \ - grep '#undef[[:blank:]]CONFIG_' $CFG | \ - sed -n 's/#undef.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p') | \ - sort -u > ${KUSEDLST} || true - NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | \ - cut -d , -f 3` - if [[ $NUM -ne 0 ]]; then - echo "Unmigrated symbols found in $CFG:" - comm -12 ${KSYMLST} ${KUSEDLST} - RET=1 - fi - done - exit $RET + # If grep succeeds and finds a match the test fails as we should + # have no matches. + - script: git grep -E '^#[[:blank:]]*(define|undef)[[:blank:]]*CONFIG_' \ + include/configs `find arch -name config.h` && exit 1 || exit 0 - job: cppcheck displayName: 'Static code analysis with cppcheck'
.gitlab-ci.yml +5 -23
@@ -124,31 +124,13 @@ build all other platforms: exit $ret; fi; -check for migrated symbols in board header: +check for new CONFIG symbols outside Kconfig: stage: testsuites script: - - KSYMLST=`mktemp`; - KUSEDLST=`mktemp`; - RET=0; - cat `find . -name "Kconfig*"` | - sed -n -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' - -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' - | sort -u > $KSYMLST; - for CFG in `find include/configs -name "*.h"`; do - (grep '#define[[:blank:]]CONFIG_' $CFG | - sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' ; - grep '#undef[[:blank:]]CONFIG_' $CFG | - sed -n 's/#undef.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p') | - sort -u > ${KUSEDLST} || true; - NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | - cut -d , -f 3`; - if [[ $NUM -ne 0 ]]; then - echo "Unmigrated symbols found in $CFG:"; - comm -12 ${KSYMLST} ${KUSEDLST}; - RET=1; - fi; - done; - exit $RET + # If grep succeeds and finds a match the test fails as we should + # have no matches. + - git grep -E '^#[[:blank:]]*(define|undef)[[:blank:]]*CONFIG_' + include/configs `find arch -name config.h` && exit 1 || exit 0 # QA jobs for code analytics # static code analysis with cppcheck (we can add --enable=all later)
Signature · 1 line
2.25.1
Re: [PATCH 144/149] CI: Replace unmigrated symbol test with non-Kconfig introduction test
Quoted 9 lines · Tom Rini
Now that all symbols have been migrated to
Kconfig, or are part of the CFG namespace we do not need a complex check for unmigrated CONFIG symbols. Any instance of #define (or #undef) or a CONFIG value is wrong, so cause CI to fail.This test is not as strict as possible yet as we have more symbols that were not previously caught to deal with.
Signed-off-by Tom Rini <[email protected]>
At this point in the series, I want to make a few comments.
First, before applying, there are some recent other series I'll be taking, such as the one to convert keymile platforms, which makes some of the patches here irrelevant.
Second, and as implied by the last few patches in this series, the regex pattern here finds more symbols, some of which we can ignore. For example, the final form of this test will just ignore arch/*/dts/ as CONFIG symbols defined there are coming in from Linux and not our concern. And include/linux/kconfig.h defines CONFIG_IS_ENABLED, etc, so also valid defines. But there's a lot of oddball defines out there, which I intend to deal with. Starting with symbols which do NOT follow the pattern of '#defineSPACECONFIG_...' just because there's only a few of them, and dealing with those manually makes scripting something in the form of "for every symbol, is there a non-define usage of it" should get rid of many of them, as unused code. The hopefully follow up to that is usage in code that should be removed anyhow as it's never enabled (and not something like an RTC driver that should be enabled for sandbox as it's otherwise up to date).
Third, this is still a big milestone. Everything in the big list of symbols has been handled and tooling is in place to catch re-introductions. I want to thank everyone for their hard work getting us here.
Signature · 1 line
Tom
PATCH 145/149 kbuild: Remove checking for adhoc CONFIG symbols
In reply to Tom RiniAt this point all listed adhoc CONFIG symbols have been migrated to Kconfig or removed from the tree or renamed to CFG (or similar). We also now have CI tests that will error on any new introductions, and checkpatch.pl also looks. We can now remove these hooks and related scripts.
--- Makefile | 8 -- scripts/build-whitelist.sh | 45 ------ scripts/check-config.sh | 63 --------- scripts/config_whitelist.txt | 261 ----------------------------------- tools/moveconfig.py | 32 +---- 5 files changed, 2 insertions(+), 407 deletions(-) delete mode 100755 scripts/build-whitelist.sh delete mode 100755 scripts/check-config.sh
Makefile +0 -8
@@ -1073,10 +1073,6 @@ cmd_lzma = lzma -c -z -k -9 $< > $@ cfg: u-boot.cfg -quiet_cmd_cfgcheck = CFGCHK $2 -cmd_cfgcheck = $(srctree)/scripts/check-config.sh $2 \ - $(srctree)/scripts/config_whitelist.txt $(srctree) - quiet_cmd_ofcheck = OFCHK $2 cmd_ofcheck = $(srctree)/scripts/check-of.sh $2 \ $(srctree)/scripts/of_allowlist.txt
@@ -1144,10 +1140,6 @@ endif $(call deprecated,CONFIG_TIMER,Timer drivers,v2023.01,$(if $(strip $(CFG_SYS_TIMER_RATE)$(CFG_SYS_TIMER_COUNTER)),x)) $(call deprecated,CONFIG_DM_SERIAL,Serial drivers,v2023.04,$(CONFIG_SERIAL)) $(call deprecated,CONFIG_DM_SCSI,SCSI drivers,v2023.04,$(CONFIG_SCSI)) - @# Check that this build does not use CONFIG options that we do not - @# know about unless they are in Kconfig. All the existing CONFIG - @# options are whitelisted, so new ones should not be added. - $(call cmd,cfgcheck,u-boot.cfg) @# Check that this build does not override OF_HAS_PRIOR_STAGE by @# disabling OF_BOARD. $(call cmd,ofcheck,$(KCONFIG_CONFIG))
scripts/build-whitelist.sh deleted +0 -45
45 lines not on this page · raw message
scripts/check-config.sh deleted +0 -63
63 lines not on this page · raw message
scripts/config_whitelist.txt +0 -261
261 lines not on this page · raw message
tools/moveconfig.py +2 -30
@@ -443,22 +443,6 @@ def cleanup_headers(configs, args): cleanup_one_header(header_path, patterns, args) cleanup_empty_blocks(header_path, args) -def cleanup_whitelist(configs, args): - """Delete config whitelist entries - - Args: - configs: A list of CONFIGs to remove. - args (Namespace): program arguments - """ - if not confirm(args, 'Clean up whitelist entries?'): - return - - lines = read_file(os.path.join('scripts', 'config_whitelist.txt')) - - lines = [x for x in lines if x.strip() not in configs] - - write_file(os.path.join('scripts', 'config_whitelist.txt'), lines) - def find_matching(patterns, line): for pat in patterns: if pat.search(line):
@@ -1558,14 +1542,10 @@ def do_find_config(config_list): """ all_configs, all_defconfigs, config_db, defconfig_db = read_database() - # Get the whitelist - adhoc_configs = set(read_file('scripts/config_whitelist.txt')) - # Start with all defconfigs out = all_defconfigs # Work through each config in turn - adhoc = [] for item in config_list: # Get the real config name and whether we want this config or not cfg = item
@@ -1574,10 +1554,6 @@ def do_find_config(config_list): want = False cfg = cfg[1:] - if cfg in adhoc_configs: - adhoc.append(cfg) - continue - # Search everything that is still in the running. If it has a config # that we want, or doesn't have one that we don't, add it into the # running for the next stage
@@ -1588,11 +1564,8 @@ def do_find_config(config_list): has_cfg = defconfig_matches(config_db[defc], re_match) if has_cfg == want: out.add(defc) - if adhoc: - print(f"Error: Not in Kconfig: %s" % ' '.join(adhoc)) - else: - print(f'{len(out)} matches') - print(' '.join(item.split('_defconfig')[0] for item in out)) + print(f'{len(out)} matches') + print(' '.join(item.split('_defconfig')[0] for item in out)) def prefix_config(cfg):
@@ -1739,7 +1712,6 @@ doc/develop/moveconfig.rst for documentation.''' if configs: cleanup_headers(configs, args) - cleanup_whitelist(configs, args) cleanup_readme(configs, args) if args.commit:
Signature · 1 line
2.25.1
PATCH 146/149 post: Move CONFIG_SYS_POST to CFG_SYS_POST
In reply to Tom RiniMigrate the rest of the CONFIG_SYS_POST macros over to CFG_SYS_POST namespace.
--- doc/README.POST | 12 +-- drivers/serial/serial-uclass.c | 2 +- drivers/serial/serial.c | 2 +- include/post.h | 50 ++++++------ include/serial.h | 4 +- post/cpu/mpc83xx/ecc.c | 8 +- post/drivers/flash.c | 14 ++-- post/drivers/i2c.c | 20 ++--- post/drivers/rtc.c | 4 +- post/lib_powerpc/andi.c | 2 +- post/lib_powerpc/asm.S | 2 +- post/lib_powerpc/b.c | 2 +- post/lib_powerpc/cmp.c | 2 +- post/lib_powerpc/cmpi.c | 2 +- post/lib_powerpc/complex.c | 2 +- post/lib_powerpc/cpu.c | 4 +- post/lib_powerpc/cr.c | 2 +- post/lib_powerpc/fpu/20001122-1.c | 4 +- post/lib_powerpc/fpu/20010114-2.c | 4 +- post/lib_powerpc/fpu/20010226-1.c | 4 +- post/lib_powerpc/fpu/980619-1.c | 4 +- post/lib_powerpc/fpu/acc1.c | 4 +- post/lib_powerpc/fpu/compare-fp-1.c | 4 +- post/lib_powerpc/fpu/fpu.c | 4 +- post/lib_powerpc/fpu/mul-subnormal-single-1.c | 4 +- post/lib_powerpc/load.c | 2 +- post/lib_powerpc/multi.c | 2 +- post/lib_powerpc/rlwimi.c | 2 +- post/lib_powerpc/rlwinm.c | 2 +- post/lib_powerpc/rlwnm.c | 2 +- post/lib_powerpc/srawi.c | 2 +- post/lib_powerpc/store.c | 2 +- post/lib_powerpc/string.c | 2 +- post/lib_powerpc/three.c | 2 +- post/lib_powerpc/threei.c | 2 +- post/lib_powerpc/threex.c | 2 +- post/lib_powerpc/two.c | 2 +- post/lib_powerpc/twox.c | 2 +- post/post.c | 6 +- post/tests.c | 78 +++++++++---------- 40 files changed, 138 insertions(+), 138 deletions(-)
doc/README.POST +6 -6
@@ -649,15 +649,15 @@ not need any modifications for porting them to another board/CPU. For verifying the I2C bus, a full I2C bus scanning will be performed using the i2c_probe() routine. If a board defines -CONFIG_SYS_POST_I2C_ADDRS the I2C test will pass if all devices -listed in CONFIG_SYS_POST_I2C_ADDRS are found, and no additional -devices are detected. If CONFIG_SYS_POST_I2C_ADDRS is not defined +CFG_SYS_POST_I2C_ADDRS the I2C test will pass if all devices +listed in CFG_SYS_POST_I2C_ADDRS are found, and no additional +devices are detected. If CFG_SYS_POST_I2C_ADDRS is not defined the test will pass if any I2C device is found. -The CONFIG_SYS_POST_I2C_IGNORES define can be used to list I2C +The CFG_SYS_POST_I2C_IGNORES define can be used to list I2C devices which may or may not be present when using -CONFIG_SYS_POST_I2C_ADDRS. The I2C POST test will pass regardless -if the devices in CONFIG_SYS_POST_I2C_IGNORES are found or not. +CFG_SYS_POST_I2C_ADDRS. The I2C POST test will pass regardless +if the devices in CFG_SYS_POST_I2C_IGNORES are found or not. This is useful in cases when I2C devices are optional (eg on a daughtercard that may or may not be present) or not critical to board operation.
drivers/serial/serial-uclass.c +1 -1
@@ -526,7 +526,7 @@ static int serial_post_probe(struct udevice *dev) ops->getconfig += gd->reloc_off;if (ops->setconfig) ops->setconfig += gd->reloc_off; -#if CFG_POST &CONFIG_SYS_POST_UART +#if CFG_POST &CFG_SYS_POST_UART if (ops->loop) ops->loop += gd->reloc_off;#endif
drivers/serial/serial.c +1 -1
@@ -458,7 +458,7 @@ void default_serial_puts(const char *s) dev->putc (*s++); } -#if CFG_POST &CONFIG_SYS_POST_UART +#if CFG_POST &CFG_SYS_POST_UART static const int bauds[] =CFG_SYS_BAUDRATE_TABLE ;/**
include/post.h +25 -25
69 lines not on this page · raw message
include/serial.h +2 -2
@@ -14,7 +14,7 @@ struct serial_device {int (*tstc)(void );void (*putc)(const char c);void (*puts)(const char *s); -#if CFG_POST &CONFIG_SYS_POST_UART +#if CFG_POST &CFG_SYS_POST_UART void (*loop)(int );#endif struct serial_device *next;
@@ -242,7 +242,7 @@ struct dm_serial_ops {* @return 0 if OK, -ve on error */ int (*clear)(struct udevice *dev); -#if CFG_POST &CONFIG_SYS_POST_UART +#if CFG_POST &CFG_SYS_POST_UART /** * loop() - Control serial device loopback mode *
post/cpu/mpc83xx/ecc.c +4 -4
@@ -17,7 +17,7 @@#include <asm/io.h> #include <post.h> -#if CFG_POST &CONFIG_SYS_POST_ECC +#if CFG_POST &CFG_SYS_POST_ECC /* * We use the RAW I/O accessors where possible in order to * achieve performance goal, since the test's execution time
@@ -51,7 +51,7 @@ int ecc_post_test(int flags)int errbit;u32 pattern[2 ], writeback[2 ], retval[2 ];ddr83xx_t *ddr = &((immap_t *)CONFIG_SYS_IMMR )->ddr; -volatile u64 *addr = (u64 *)CONFIG_SYS_POST_ECC_START_ADDR ; +volatile u64 *addr = (u64 *)CFG_SYS_POST_ECC_START_ADDR ;/* The pattern is written into memory to generate error */ pattern[0 ] =0xfedcba98UL ;
@@ -70,8 +70,8 @@ int ecc_post_test(int flags) int_state =disable_interrupts ();icache_enable (); -for (addr = (u64 *)CONFIG_SYS_POST_ECC_START_ADDR , errbit=0 ; - addr < (u64 *)CONFIG_SYS_POST_ECC_STOP_ADDR ; addr++, errbit++ ) { +for (addr = (u64 *)CFG_SYS_POST_ECC_START_ADDR , errbit=0 ; + addr < (u64 *)CFG_SYS_POST_ECC_STOP_ADDR ; addr++, errbit++ ) {schedule ();
post/drivers/flash.c +7 -7
@@ -6,7 +6,7 @@* Licensed under the GPL-2 or later. */ -#if CFG_POST &CONFIG_SYS_POST_FLASH +#if CFG_POST &CFG_SYS_POST_FLASH #include <common.h> #include <malloc.h> #include <post.h>
@@ -23,10 +23,10 @@* - better seed pattern than 0x00..0xff */ -#ifndef CONFIG_SYS_POST_FLASH_NUM -# define CONFIG_SYS_POST_FLASH_NUM 0 +#ifndef CFG_SYS_POST_FLASH_NUM +# define CFG_SYS_POST_FLASH_NUM 0#endif -#if CONFIG_SYS_POST_FLASH_START >=CONFIG_SYS_POST_FLASH_END +#if CFG_SYS_POST_FLASH_START >=CFG_SYS_POST_FLASH_END # error "invalid flash block start/end"#endif
@@ -59,9 +59,9 @@ int flash_post_test(int flags) len =0 ; src =NULL ; - info = &flash_info[CONFIG_SYS_POST_FLASH_NUM ]; - n_start =CONFIG_SYS_POST_FLASH_START ; - n_end =CONFIG_SYS_POST_FLASH_END ; + info = &flash_info[CFG_SYS_POST_FLASH_NUM ]; + n_start =CFG_SYS_POST_FLASH_START ; + n_end =CFG_SYS_POST_FLASH_END ;for (n = n_start; n < n_end; ++n) {ulong s_start, s_len, s_off;
post/drivers/i2c.c +10 -10
@@ -9,14 +9,14 @@* * For verifying the I2C bus, a full I2C bus scanning is performed. * -* #ifdef CONFIG_SYS_POST_I2C_ADDRS +* #ifdef CFG_SYS_POST_I2C_ADDRS * The test is considered as passed if all the devices and only the devices * in the list are found. -* #ifdef CONFIG_SYS_POST_I2C_IGNORES -* Ignore devices listed in CONFIG_SYS_POST_I2C_IGNORES. These devices +* #ifdef CFG_SYS_POST_I2C_IGNORES +* Ignore devices listed in CFG_SYS_POST_I2C_IGNORES. These devices * are optional or not vital to board functionality. * #endif -* #else [ ! CONFIG_SYS_POST_I2C_ADDRS ] +* #else [ ! CFG_SYS_POST_I2C_ADDRS ] * The test is considered as passed if any I2C device is found. * #endif */
@@ -26,12 +26,12 @@#include <post.h> #include <i2c.h> -#if CFG_POST &CONFIG_SYS_POST_I2C +#if CFG_POST &CFG_SYS_POST_I2C static int i2c_ignore_device (unsigned int chip) { -#ifdef CONFIG_SYS_POST_I2C_IGNORES -const unsigned char i2c_ignore_list[] =CONFIG_SYS_POST_I2C_IGNORES ; +#ifdef CFG_SYS_POST_I2C_IGNORES +const unsigned char i2c_ignore_list[] =CFG_SYS_POST_I2C_IGNORES ;int i;for (i =0 ; i <sizeof (i2c_ignore_list); i++)
@@ -45,7 +45,7 @@ static int i2c_ignore_device(unsigned int chip)int i2c_post_test (int flags) {unsigned int i; -#ifndef CONFIG_SYS_POST_I2C_ADDRS +#ifndef CFG_SYS_POST_I2C_ADDRS /* Start at address 1, address 0 is the general call address */ for (i =1 ; i <128 ; i++) {if (i2c_ignore_device (i))
@@ -59,7 +59,7 @@ int i2c_post_test (int flags)#else unsigned int ret =0 ;int j; -unsigned char i2c_addr_list[] =CONFIG_SYS_POST_I2C_ADDRS ; +unsigned char i2c_addr_list[] =CFG_SYS_POST_I2C_ADDRS ;/* Start at address 1, address 0 is the general call address */ for (i =1 ; i <128 ; i++) {
@@ -94,4 +94,4 @@ int i2c_post_test (int flags) #endif } -#endif /* CFG_POST & CONFIG_SYS_POST_I2C */ +#endif /* CFG_POST & CFG_SYS_POST_I2C */
post/drivers/rtc.c +2 -2
@@ -26,7 +26,7 @@#include <post.h> #include <rtc.h> -#if CFG_POST &CONFIG_SYS_POST_RTC +#if CFG_POST &CFG_SYS_POST_RTC static int rtc_post_skip (ulong * diff) {
@@ -189,4 +189,4 @@ int rtc_post_test (int flags) return 0; } -#endif /* CFG_POST & CONFIG_SYS_POST_RTC */ +#endif /* CFG_POST & CFG_SYS_POST_RTC */
post/lib_powerpc/andi.c +1 -1
@@ -19,7 +19,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_21 (ulong *code,ulong *cr,ulong *res,ulong op);extern ulong cpu_post_makecr (long v);
post/lib_powerpc/asm.S +1 -1
@@ -10,7 +10,7 @@ #include <ppc_defs.h> #include <asm/cache.h> -#if CFG_POST & CONFIG_SYS_POST_CPU +#if CFG_POST & CFG_SYS_POST_CPU /* void cpu_post_exec_02 (ulong *code, ulong op1, ulong op2); */ .global cpu_post_exec_02
post/lib_powerpc/b.c +1 -1
@@ -24,7 +24,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_11 (ulong *code,ulong *res,ulong op1); extern void cpu_post_exec_31 (ulong *code, ulong *ctr, ulong *lr, ulong *jump,
post/lib_powerpc/cmp.c +1 -1
@@ -23,7 +23,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_12 (ulong *code,ulong *res,ulong op1,ulong op2);
post/lib_powerpc/cmpi.c +1 -1
@@ -23,7 +23,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_11 (ulong *code,ulong *res,ulong op1);
post/lib_powerpc/complex.c +1 -1
@@ -18,7 +18,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern int cpu_post_complex_1_asm (int a1,int a2,int a3,int a4,int n);extern int cpu_post_complex_2_asm (int x,int n);
post/lib_powerpc/cpu.c +2 -2
@@ -20,7 +20,7 @@#include <post.h> #include <asm/mmu.h> -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern int cpu_post_test_cmp (void );extern int cpu_post_test_cmpi (void );
@@ -118,4 +118,4 @@ int cpu_post_test (int flags) return ret; } -#endif /* CFG_POST & CONFIG_SYS_POST_CPU */ +#endif /* CFG_POST & CFG_SYS_POST_CPU */
post/lib_powerpc/cr.c +1 -1
@@ -33,7 +33,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_11 (ulong *code,ulong *res,ulong op1);extern void cpu_post_exec_21x (ulong *code,ulong *op1,ulong *op2,ulong op3);
post/lib_powerpc/fpu/20001122-1.c +2 -2
@@ -13,7 +13,7 @@ GNU_FPOST_ATTR -#if CFG_POST &CONFIG_SYS_POST_FPU +#if CFG_POST &CFG_SYS_POST_FPU int fpu_post_test_math1 (void ) {
@@ -40,4 +40,4 @@ int fpu_post_test_math1 (void) return 0; } -#endif /* CFG_POST & CONFIG_SYS_POST_FPU */ +#endif /* CFG_POST & CFG_SYS_POST_FPU */
post/lib_powerpc/fpu/20010114-2.c +2 -2
@@ -13,7 +13,7 @@ GNU_FPOST_ATTR -#if CFG_POST &CONFIG_SYS_POST_FPU +#if CFG_POST &CFG_SYS_POST_FPU static float rintf (float x) {
@@ -45,4 +45,4 @@ int fpu_post_test_math2 (void) return 0; } -#endif /* CFG_POST & CONFIG_SYS_POST_FPU */ +#endif /* CFG_POST & CFG_SYS_POST_FPU */
post/lib_powerpc/fpu/20010226-1.c +2 -2
@@ -13,7 +13,7 @@ GNU_FPOST_ATTR -#if CFG_POST &CONFIG_SYS_POST_FPU +#if CFG_POST &CFG_SYS_POST_FPU int fpu_post_test_math3 (void ) {
@@ -33,4 +33,4 @@ int fpu_post_test_math3 (void) return 0; } -#endif /* CFG_POST & CONFIG_SYS_POST_FPU */ +#endif /* CFG_POST & CFG_SYS_POST_FPU */
post/lib_powerpc/fpu/980619-1.c +2 -2
@@ -13,7 +13,7 @@ GNU_FPOST_ATTR -#if CFG_POST &CONFIG_SYS_POST_FPU +#if CFG_POST &CFG_SYS_POST_FPU int fpu_post_test_math4 (void ) {
@@ -39,4 +39,4 @@ int fpu_post_test_math4 (void) return 0; } -#endif /* CFG_POST & CONFIG_SYS_POST_FPU */ +#endif /* CFG_POST & CFG_SYS_POST_FPU */
post/lib_powerpc/fpu/acc1.c +2 -2
@@ -13,7 +13,7 @@ GNU_FPOST_ATTR -#if CFG_POST &CONFIG_SYS_POST_FPU +#if CFG_POST &CFG_SYS_POST_FPU static double func (const double *array) {
@@ -36,4 +36,4 @@ int fpu_post_test_math5 (void) return 0; } -#endif /* CFG_POST & CONFIG_SYS_POST_FPU */ +#endif /* CFG_POST & CFG_SYS_POST_FPU */
post/lib_powerpc/fpu/compare-fp-1.c +2 -2
@@ -15,7 +15,7 @@ GNU_FPOST_ATTR -#if CFG_POST &CONFIG_SYS_POST_FPU +#if CFG_POST &CFG_SYS_POST_FPU static int failed;
@@ -204,4 +204,4 @@ int fpu_post_test_math6 (void) return 0; } -#endif /* CFG_POST & CONFIG_SYS_POST_FPU */ +#endif /* CFG_POST & CFG_SYS_POST_FPU */
post/lib_powerpc/fpu/fpu.c +2 -2
@@ -21,7 +21,7 @@ GNU_FPOST_ATTR -#if CFG_POST &CONFIG_SYS_POST_FPU +#if CFG_POST &CFG_SYS_POST_FPU #include <watchdog.h>
@@ -71,4 +71,4 @@ int fpu_post_test (int flags) return ret; } -#endif /* CFG_POST & CONFIG_SYS_POST_FPU */ +#endif /* CFG_POST & CFG_SYS_POST_FPU */
post/lib_powerpc/fpu/mul-subnormal-single-1.c +2 -2
@@ -15,7 +15,7 @@ GNU_FPOST_ATTR -#if CFG_POST &CONFIG_SYS_POST_FPU +#if CFG_POST &CFG_SYS_POST_FPU union uf {
@@ -82,4 +82,4 @@ int fpu_post_test_math7 (void) return 0; } -#endif /* CFG_POST & CONFIG_SYS_POST_FPU */ +#endif /* CFG_POST & CFG_SYS_POST_FPU */
post/lib_powerpc/load.c +1 -1
@@ -28,7 +28,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_22w (ulong *code,ulong *op1,ulong op2,ulong *op3);extern void cpu_post_exec_21w (ulong *code,ulong *op1,ulong *op2);
post/lib_powerpc/multi.c +1 -1
@@ -21,7 +21,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_02 (ulong *code,ulong op1,ulong op2);
post/lib_powerpc/rlwimi.c +1 -1
@@ -19,7 +19,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_22 (ulong *code,ulong *cr,ulong *res,ulong op1,ulong op2);
post/lib_powerpc/rlwinm.c +1 -1
@@ -19,7 +19,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_21 (ulong *code,ulong *cr,ulong *res,ulong op1);extern ulong cpu_post_makecr (long v);
post/lib_powerpc/rlwnm.c +1 -1
@@ -19,7 +19,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_22 (ulong *code,ulong *cr,ulong *res,ulong op1,ulong op2);
post/lib_powerpc/srawi.c +1 -1
@@ -19,7 +19,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_21 (ulong *code,ulong *cr,ulong *res,ulong op);extern ulong cpu_post_makecr (long v);
post/lib_powerpc/store.c +1 -1
@@ -28,7 +28,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_12w (ulong *code,ulong *op1,ulong op2,ulong op3);extern void cpu_post_exec_11w (ulong *code,ulong *op1,ulong op2);
post/lib_powerpc/string.c +1 -1
@@ -20,7 +20,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_02 (ulong *code,ulong op1,ulong op2); extern void cpu_post_exec_04 (ulong *code, ulong op1, ulong op2, ulong op3,
post/lib_powerpc/three.c +1 -1
@@ -22,7 +22,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_22 (ulong *code,ulong *cr,ulong *res,ulong op1,ulong op2);
post/lib_powerpc/threei.c +1 -1
@@ -21,7 +21,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_21 (ulong *code,ulong *cr,ulong *res,ulong op);extern ulong cpu_post_makecr (long v);
post/lib_powerpc/threex.c +1 -1
@@ -22,7 +22,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_22 (ulong *code,ulong *cr,ulong *res,ulong op1,ulong op2);
post/lib_powerpc/two.c +1 -1
@@ -22,7 +22,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_21 (ulong *code,ulong *cr,ulong *res,ulong op1);extern ulong cpu_post_makecr (long v);
post/lib_powerpc/twox.c +1 -1
@@ -22,7 +22,7 @@#include <post.h> #include "cpu_asm.h" -#if CFG_POST &CONFIG_SYS_POST_CPU +#if CFG_POST &CFG_SYS_POST_CPU extern void cpu_post_exec_21 (ulong *code,ulong *cr,ulong *res,ulong op1);extern ulong cpu_post_makecr (long v);
post/post.c +3 -3
@@ -16,7 +16,7 @@#include <post.h> #include <asm/global_data.h> -#ifdef CONFIG_SYS_POST_HOTKEYS_GPIO +#ifdef CFG_SYS_POST_HOTKEYS_GPIO #include <asm/gpio.h> #endif
@@ -55,9 +55,9 @@ int post_init_f(void)*/ __weak int post_hotkeys_pressed (void ) { -#ifdef CONFIG_SYS_POST_HOTKEYS_GPIO +#ifdef CFG_SYS_POST_HOTKEYS_GPIO int ret; -unsigned gpio =CONFIG_SYS_POST_HOTKEYS_GPIO ; +unsigned gpio =CFG_SYS_POST_HOTKEYS_GPIO ; ret =gpio_request (gpio,"hotkeys" );if (ret) {
post/tests.c +39 -39
234 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 147/149 pci-rcar-gen3: Rename CONFIG_SEND_ENABLE
In reply to Tom RiniWe rename the symbol CONFIG_SEND_ENABLE to just SEND_ENABLE, and remove the second whitespace following the define.
--- drivers/pci/pci-rcar-gen3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pci/pci-rcar-gen3.c +3 -3
@@ -27,7 +27,7 @@#define PCIECAR 0x000010#define PCIECCTLR 0x000018 -#define CONFIG_SEND_ENABLE BIT(31) +#define SEND_ENABLE BIT(31)#define TYPE0 (0 << 8)#define TYPE1 BIT(8)#define PCIECDR 0x000020
@@ -170,9 +170,9 @@ static int rcar_pcie_config_access(const struct udevice *udev,/* Enable the configuration access */ if (!PCI_BUS (bdf)) -writel (CONFIG_SEND_ENABLE |TYPE0 , priv->regs +PCIECCTLR ); +writel (SEND_ENABLE |TYPE0 , priv->regs +PCIECCTLR );else -writel (CONFIG_SEND_ENABLE |TYPE1 , priv->regs +PCIECCTLR ); +writel (SEND_ENABLE |TYPE1 , priv->regs +PCIECCTLR );/* Check for errors */ if (readl (priv->regs +PCIEERRFR ) &UNSUPPORTED_REQUEST )
Signature · 1 line
2.25.1
PATCH 148/149 cf_spi.c: Rename CONFIG_SPI_IDLE_VAL to SPI_IDLE_VAL
In reply to Tom RiniThis value is never changed by boards, so just rename it to SPI_IDLE_VAL to fit with the rest of the code.
--- drivers/spi/cf_spi.c | 12 ++++++------ drivers/spi/sandbox_spi.c | 4 ---- 2 files changed, 6 insertions(+), 10 deletions(-)
drivers/spi/cf_spi.c +6 -6
@@ -32,11 +32,11 @@ struct coldfire_spi_priv {DECLARE_GLOBAL_DATA_PTR ; -#ifndef CONFIG_SPI_IDLE_VAL +#ifndef SPI_IDLE_VAL #if defined(CONFIG_SPI_MMC ) -#define CONFIG_SPI_IDLE_VAL 0xFFFF +#define SPI_IDLE_VAL 0xFFFF#else -#define CONFIG_SPI_IDLE_VAL 0x0 +#define SPI_IDLE_VAL 0x0#endif #endif
@@ -184,7 +184,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen, }if (din) { -cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL ); +cfspi_tx (cfspi, ctrl,SPI_IDLE_VAL );if (cfspi->charbit ==16 ) *spi_rd16++ =cfspi_rx (cfspi);else
@@ -208,7 +208,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen, }if (din) { -cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL ); +cfspi_tx (cfspi, ctrl,SPI_IDLE_VAL );if (cfspi->charbit ==16 ) *spi_rd16 =cfspi_rx (cfspi);else
@@ -216,7 +216,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen, } }else {/* dummy read */ -cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL ); +cfspi_tx (cfspi, ctrl,SPI_IDLE_VAL );cfspi_rx (cfspi); }
drivers/spi/sandbox_spi.c +0 -4
@@ -24,10 +24,6 @@#include <dm/acpi.h> #include <dm/device-internal.h> -#ifndef CONFIG_SPI_IDLE_VAL -# define CONFIG_SPI_IDLE_VAL 0xFF -#endif -/** * struct sandbox_spi_priv - Sandbox SPI private data *
Signature · 1 line
2.25.1
PATCH 149/149 common/spl/spl_ram: Remove unused default
In reply to Tom RiniWe ask for CONFIG_SPL_LOAD_FIT_ADDRESS in Kconfig, so we cannot define it in C as a fall-back. However, this option previously was buried under "if ... endif" Kconfig logic. Rework a number of config options to now have more robust dependency lines so that we can ask this address when needed. With that done, we can remove the fallback in spl_ram.c.
--- boot/Kconfig | 29 +++++++++++++++-------------- common/spl/spl_ram.c | 4 ---- 2 files changed, 15 insertions(+), 18 deletions(-)
boot/Kconfig +15 -14
@@ -36,10 +36,9 @@ config TIMESTAMP loaded that does not, the message 'Wrong FIT format: no timestamp' is shown. -if FIT - config FIT_EXTERNAL_OFFSET hex "FIT external data offset" + depends on FIT default 0x0 help This specifies a data offset in fit image.
@@ -50,6 +49,7 @@ config FIT_EXTERNAL_OFFSET config FIT_FULL_CHECK bool "Do a full check of the FIT before using it" + depends on FIT default y help Enable this do a full check of the FIT to make sure it is valid. This
@@ -59,7 +59,7 @@ config FIT_FULL_CHECK config FIT_SIGNATURE bool "Enable signature verification of FIT uImages" - depends on DM + depends on DM && FIT select HASH imply RSA imply RSA_VERIFY
@@ -97,7 +97,7 @@ config FIT_RSASSA_PSS config FIT_CIPHER bool "Enable ciphering data in a FIT uImages" - depends on DM + depends on DM && FIT select AES help Enable the feature of data ciphering/unciphering in the tool mkimage
@@ -105,6 +105,7 @@ config FIT_CIPHER config FIT_VERBOSE bool "Show verbose messages when FIT images fail" + depends on FIT help Generally a system will have valid FIT images so debug messages are a waste of code space. If you are debugging your images then
@@ -113,6 +114,7 @@ config FIT_VERBOSE config FIT_BEST_MATCH bool "Select the best match for the kernel device tree" + depends on FIT help When no configuration is explicitly selected, default to the one whose fdt's compatibility field best matches that of
@@ -122,6 +124,7 @@ config FIT_BEST_MATCH config FIT_IMAGE_POST_PROCESS bool "Enable post-processing of FIT artifacts after loading by U-Boot" + depends on FIT depends on TI_SECURE_DEVICE || SOCFPGA_SECURE_VAB_AUTH default y if TI_SECURE_DEVICE help
@@ -137,15 +140,14 @@ config FIT_IMAGE_POST_PROCESS config FIT_PRINT bool "Support FIT printing" + depends on FIT default y help Support printing the content of the fitImage in a verbose manner. -if SPL - config SPL_FIT bool "Support Flattened Image Tree within SPL" - depends on SPL + depends on SPL && FIT select SPL_HASH select SPL_OF_LIBFDT
@@ -157,13 +159,13 @@ config SPL_FIT_PRINT config SPL_FIT_FULL_CHECK bool "Do a full check of the FIT before using it" + depends on SPL_FIT help Enable this do a full check of the FIT to make sure it is valid. This helps to protect against carefully crafted FITs which take advantage of bugs or omissions in the code. This includes a bad structure, multiple root nodes and the like. - config SPL_FIT_SIGNATURE bool "Enable signature verification of FIT firmware within SPL" depends on SPL_DM
@@ -196,6 +198,7 @@ config SPL_FIT_RSASSA_PSS config SPL_LOAD_FIT bool "Enable SPL loading U-Boot as a FIT (basic fitImage features)" + depends on SPL && FIT select SPL_FIT help Normally with the SPL framework a legacy image is generated as part
@@ -217,7 +220,7 @@ config SPL_LOAD_FIT config SPL_LOAD_FIT_ADDRESS hex "load address of fit image" - depends on SPL_LOAD_FIT + depends on SPL_LOAD_FIT || SPL_RAM_SUPPORT || TPL_RAM_SUPPORT default 0x0 help Specify the load address of the fit image that will be loaded
@@ -243,6 +246,7 @@ config SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ config SPL_LOAD_FIT_FULL bool "Enable SPL loading U-Boot as a FIT (full fitImage features)" + depends on FIT select SPL_FIT help Normally with the SPL framework a legacy image is generated as part
@@ -277,7 +281,8 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" - default y if SPL_FIT && (!ARCH_SUNXI && !RISCV) + depends on SPL_FIT + default y if !ARCH_SUNXI && !RISCV config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image"
@@ -290,8 +295,6 @@ config SPL_FIT_GENERATOR passed a list of supported device tree file stub names to include in the generated image. -endif # SPL - if VPL config VPL_FIT
@@ -342,8 +345,6 @@ config VPL_FIT_SIGNATURE_MAX_SIZE endif # VPL -endif # FIT - config PXE_UTILS bool select MENU
common/spl/spl_ram.c +0 -4
@@ -17,10 +17,6 @@#include <spl.h> #include <linux/libfdt.h> -#ifndef CONFIG_SPL_LOAD_FIT_ADDRESS -# define CONFIG_SPL_LOAD_FIT_ADDRESS 0 -#endif -static ulong spl_ram_load_read (struct spl_load_info *load,ulong sector,ulong count,void *buf) {
Signature · 1 line
2.25.1
Re: [PATCH 091/149] global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG
In reply to Tom RiniQuoted 6 lines · Tom Rini
Perform simple renames of:
CONFIG_MXC_USB_FLAGStoCFG_MXC_USB_FLAGS
CONFIG_MXC_USB_PORTtoCFG_MXC_USB_PORT
CONFIG_MXC_USB_PORTSCtoCFG_MXC_USB_PORTSCSigned-off-by Tom Rini <[email protected]>
Duplicate posting because I once again hit the maximum number of emails in a row I can send before Google says No, and then off by one in my resending.
Signature · 1 line
Tom
Re: [PATCH 01/41] usb: Update USB_STORAGE dependencies
In reply to Tom RiniQuoted 9 lines · Tom Rini
As it's no longer possible to have !DM_USB set, we can remove these dependencies.
Signed-off-by Tom Rini <[email protected]>--- common/spl/Kconfig | 2 +- drivers/usb/Kconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
Re: [PATCH 01/41] usb: Update USB_STORAGE dependencies
In reply to Tom RiniQuoted 5 lines · Tom Rini
As it's no longer possible to have !DM_USB set, we can remove these dependencies.
Signed-off-by Tom Rini <[email protected]>Reviewed-by Simon Glass <[email protected]>
For the series, applied to u-boot/next, thanks!
Signature · 1 line
Tom
Re: [PATCH 01/41] xenguest_arm64: Disable networking support more fully
In reply to Tom RiniQuoted 6 lines · Tom Rini
This platform had largely disabled networking support before. More completely disable it by turning off
CONFIG_NET.Cc Anastasiia Lukianenko <[email protected]>Cc Oleksandr Andrushchenko <[email protected]>Signed-off-by Tom Rini <[email protected]>
Except for patch 6, for the series, applied to u-boot/next, thanks!
Signature · 1 line
Tom
Quoted 6 lines · Tom Rini
As we have more legacy PMIC drivers to move to
Kconfig, guard them all withPOWER_LEGACYorSPL_POWER_LEGACY. Do the same kind of check for building the drivers too. This also means that we need to resort the list slightly in theMakefile.
Quoted 7 lines
Cc Jaehoon Chung <[email protected]>Signed-off-by Tom Rini <[email protected]>--- drivers/power/pmic/Kconfig | 5 ++++- drivers/power/pmic/Makefile | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-)
Quoted 8 lines · Tom Rini
As we have more legacy PMIC drivers to move to
Kconfig, guard them all withPOWER_LEGACYorSPL_POWER_LEGACY. Do the same kind of check for building the drivers too. This also means that we need to resort the list slightly in theMakefile.Cc Jaehoon Chung <[email protected]>Signed-off-by Tom Rini <[email protected]>Reviewed-by Simon Glass <[email protected]>
For the series, applied to u-boot/next, thanks!
Signature · 1 line
Tom