diff options
343 files changed, 118 insertions, 602 deletions
diff --git a/arch/riscv/dts/jh7110-u-boot.dtsi b/arch/riscv/dts/jh7110-u-boot.dtsi index c09d5c91708..2f560e7296f 100644 --- a/arch/riscv/dts/jh7110-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-u-boot.dtsi @@ -93,10 +93,6 @@ bootph-pre-ram; }; -&pllclk { - bootph-pre-ram; -}; - &S7_0 { status = "okay"; }; diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index 9a05b662fd6..65dc49f6fa5 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -26,6 +26,7 @@ obj-y += setjmp.o obj-$(CONFIG_$(SPL_)SMP) += smp.o obj-$(CONFIG_SPL_BUILD) += spl.o obj-y += fdt_fixup.o +obj-$(CONFIG_$(SPL)CMD_BDI) += bdinfo.o # For building EFI apps CFLAGS_NON_EFI := -fstack-protector-strong diff --git a/arch/riscv/lib/bdinfo.c b/arch/riscv/lib/bdinfo.c new file mode 100644 index 00000000000..7734e51d670 --- /dev/null +++ b/arch/riscv/lib/bdinfo.c @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * RISC-V-specific information for the 'bdinfo' command + */ + +#include <init.h> +#include <asm/global_data.h> + +DECLARE_GLOBAL_DATA_PTR; + +void arch_print_bdinfo(void) +{ + bdinfo_print_num_l("boot hart", gd->arch.boot_hart); + + if (gd->arch.firmware_fdt_addr) + bdinfo_print_num_ll("firmware fdt", + (long long)gd->arch.firmware_fdt_addr); +} diff --git a/arch/riscv/lib/semihosting.S b/arch/riscv/lib/semihosting.S index c0c571bce9b..49bb419a962 100644 --- a/arch/riscv/lib/semihosting.S +++ b/arch/riscv/lib/semihosting.S @@ -8,7 +8,7 @@ .pushsection .text.smh_trap, "ax" ENTRY(smh_trap) - .align 2 + .align 4 /* keep slli, ebreak, srai in same page */ .option push .option norvc /* semihosting sequence must be 32-bit wide */ diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c index cf5610861b5..c254da62bf4 100644 --- a/board/BuS/eb_cpu5282/eb_cpu5282.c +++ b/board/BuS/eb_cpu5282/eb_cpu5282.c @@ -181,5 +181,4 @@ void __led_set(led_id_t mask, int state) /*---------------------------------------------------------------------------*/ - /* EOF EB+MCF-EV123.c */ diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c index 070933fb54b..cc3a6624155 100644 --- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c +++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c @@ -59,7 +59,6 @@ struct efi_capsule_update_info update_info = { #endif /* EFI_HAVE_CAPSULE_SUPPORT */ - int board_early_init_f(void) { init_uart_clk(2); diff --git a/board/altera/arria5-socdk/qts/iocsr_config.h b/board/altera/arria5-socdk/qts/iocsr_config.h index f201ad34587..9bd3e1b5abf 100644 --- a/board/altera/arria5-socdk/qts/iocsr_config.h +++ b/board/altera/arria5-socdk/qts/iocsr_config.h @@ -691,5 +691,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x00004100, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/altera/arria5-socdk/qts/pll_config.h b/board/altera/arria5-socdk/qts/pll_config.h index 7fe290b28d9..902caf450d3 100644 --- a/board/altera/arria5-socdk/qts/pll_config.h +++ b/board/altera/arria5-socdk/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 2 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/altera/cyclone5-socdk/qts/iocsr_config.h b/board/altera/cyclone5-socdk/qts/iocsr_config.h index a571fb3e509..6df8cdb12dd 100644 --- a/board/altera/cyclone5-socdk/qts/iocsr_config.h +++ b/board/altera/cyclone5-socdk/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x00004100, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/altera/cyclone5-socdk/qts/pll_config.h b/board/altera/cyclone5-socdk/qts/pll_config.h index a46d124e9e9..59a9dcfdb61 100644 --- a/board/altera/cyclone5-socdk/qts/pll_config.h +++ b/board/altera/cyclone5-socdk/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 4 #define CFG_HPS_ALTERAGRP_DBGATCLK 4 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/aries/mcvevk/qts/iocsr_config.h b/board/aries/mcvevk/qts/iocsr_config.h index dbcc1d719d4..3084c6a4eb8 100644 --- a/board/aries/mcvevk/qts/iocsr_config.h +++ b/board/aries/mcvevk/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x00004000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/aries/mcvevk/qts/pll_config.h b/board/aries/mcvevk/qts/pll_config.h index 62cf6796afc..fc1ba89819a 100644 --- a/board/aries/mcvevk/qts/pll_config.h +++ b/board/aries/mcvevk/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c index 1045c905f73..301d95e44fa 100644 --- a/board/armltd/vexpress64/pcie.c +++ b/board/armltd/vexpress64/pcie.c @@ -109,7 +109,6 @@ static void xr3pci_setup_atr(void) XR3_PCI_MEMSPACE64_SIZE, XR3PCI_ATR_TRSLID_AXIMEMORY); - /* setup CPU to PCIe address translation table */ base = XR3_CONFIG_BASE + XR3PCI_ATR_AXI4_SLV0; diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c index 6b92fe31c0e..5e6470d771f 100644 --- a/board/cadence/xtfpga/xtfpga.c +++ b/board/cadence/xtfpga/xtfpga.c @@ -23,7 +23,6 @@ DECLARE_GLOBAL_DATA_PTR; * (Print information about the board to stdout.) */ - #if defined(CONFIG_XTFPGA_LX60) const char *board = "XT_AV60"; const char *description = "Avnet Xilinx LX60 FPGA Evaluation Board / "; diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index 157b71da85e..616842e62f4 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -61,7 +61,6 @@ Done: return; } - unsigned long flash_init(void) { int i, j; @@ -112,7 +111,6 @@ unsigned long flash_init(void) return size; } - #define CMD_READ_ARRAY 0x00F0 #define CMD_UNLOCK1 0x00AA #define CMD_UNLOCK2 0x0055 @@ -133,7 +131,6 @@ unsigned long flash_init(void) #define ERR 2 #define TMO 4 - int flash_erase(flash_info_t *info, int s_first, int s_last) { ulong result; @@ -267,7 +264,6 @@ static int write_word(flash_info_t *info, ulong dest, ulong data) if ((result & data) != data) return ERR_NOT_ERASED; - /* * Disable interrupts which might cause a timeout * here. Remember that our exception vectors are @@ -317,7 +313,6 @@ static int write_word(flash_info_t *info, ulong dest, ulong data) return rc; } - int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) { ulong wp, data; diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 4a6cc3e5630..c6d33c32ccd 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -252,7 +252,6 @@ I2C_PADS(i2c2_pads, PAD_GPIO_6__GPIO1_IO06 | MUX_PAD_CTRL(I2C_PAD_CTRL), IMX_GPIO_NR(1, 6)); - static int cm_fx6_setup_one_i2c(int busnum, struct i2c_pads_info *pads) { int ret; diff --git a/board/compulab/cm_fx6/common.h b/board/compulab/cm_fx6/common.h index debef15880f..17b56ddc283 100644 --- a/board/compulab/cm_fx6/common.h +++ b/board/compulab/cm_fx6/common.h @@ -31,6 +31,5 @@ #define CM_FX6_SATA_NRSTDLY IMX_GPIO_NR(6, 6) #define CM_FX6_SATA_PWLOSS_INT IMX_GPIO_NR(6, 31) - void cm_fx6_set_usdhc_iomux(void); void cm_fx6_set_ecspi_iomux(void); diff --git a/board/congatec/cgtqmx8/cgtqmx8.c b/board/congatec/cgtqmx8/cgtqmx8.c index 99c33a1943e..054e4e10867 100644 --- a/board/congatec/cgtqmx8/cgtqmx8.c +++ b/board/congatec/cgtqmx8/cgtqmx8.c @@ -371,7 +371,6 @@ void detail_board_ddr_info(void) puts("\nDDR "); } - #ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, struct bd_info *bd) { diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 607e05ad9ae..03c34455c50 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -167,7 +167,6 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR; - /* setup the SUSPSRC for ARM to control emulation suspend */ writel(readl(&davinci_syscfg_regs->suspsrc) & ~(DAVINCI_SYSCFG_SUSPSRC_EMAC | DAVINCI_SYSCFG_SUSPSRC_I2C | @@ -195,7 +194,6 @@ int board_init(void) &davinci_emif_regs->ab2cr); /* CS3 */ #endif - #ifdef CONFIG_MMC_DAVINCI if (davinci_configure_pin_mux(mmc0_pins, ARRAY_SIZE(mmc0_pins)) != 0) return 1; diff --git a/board/devboards/dbm-soc1/qts/iocsr_config.h b/board/devboards/dbm-soc1/qts/iocsr_config.h index 56b2130671a..6bec839e283 100644 --- a/board/devboards/dbm-soc1/qts/iocsr_config.h +++ b/board/devboards/dbm-soc1/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x00004000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/devboards/dbm-soc1/qts/pll_config.h b/board/devboards/dbm-soc1/qts/pll_config.h index 104e324d8a4..52f1eb0c7b4 100644 --- a/board/devboards/dbm-soc1/qts/pll_config.h +++ b/board/devboards/dbm-soc1/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c index 3a5495ea18e..a50763e1926 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c +++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c @@ -541,7 +541,6 @@ static int spl_dram_perform_cal(struct mx6_ddr_sysinfo const *sysinfo) return ret; } - /* DRAM */ static void dhcom_spl_dram_init(void) { diff --git a/board/ebv/socrates/qts/iocsr_config.h b/board/ebv/socrates/qts/iocsr_config.h index c24b5cb5f0b..d9a0c72044b 100644 --- a/board/ebv/socrates/qts/iocsr_config.h +++ b/board/ebv/socrates/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x00004000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/ebv/socrates/qts/pll_config.h b/board/ebv/socrates/qts/pll_config.h index eaa18c1c802..baee1a922a8 100644 --- a/board/ebv/socrates/qts/pll_config.h +++ b/board/ebv/socrates/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/engicam/imx6q/imx6q.c b/board/engicam/imx6q/imx6q.c index d799fe6526a..a8d54128476 100644 --- a/board/engicam/imx6q/imx6q.c +++ b/board/engicam/imx6q/imx6q.c @@ -5,7 +5,6 @@ * Author: Jagan Teki <jagan@amarulasolutions.com> */ - #include <asm/io.h> #include <asm/gpio.h> #include <linux/sizes.h> diff --git a/board/freescale/common/cadmus.c b/board/freescale/common/cadmus.c index 6f66ed6851d..e5ecd0e19c6 100644 --- a/board/freescale/common/cadmus.c +++ b/board/freescale/common/cadmus.c @@ -3,7 +3,6 @@ * Copyright 2004, 2011 Freescale Semiconductor. */ - #include <config.h> #include <clock_legacy.h> #include <linux/types.h> @@ -27,7 +26,6 @@ typedef struct cadmus_reg { u_char cm_reserved[248]; /* Total 256 bytes */ } cadmus_reg_t; - unsigned int get_board_version(void) { @@ -36,7 +34,6 @@ get_board_version(void) return cadmus->cm_ver; } - unsigned long get_board_sys_clk(void) { @@ -54,7 +51,6 @@ get_board_sys_clk(void) } } - unsigned int get_pci_slot(void) { @@ -66,7 +62,6 @@ get_pci_slot(void) return ((cadmus->cm_csr >> 6) & 0x3) + 1; } - unsigned int get_pci_dual(void) { diff --git a/board/freescale/common/cadmus.h b/board/freescale/common/cadmus.h index fb74e8f6db5..93cea120845 100644 --- a/board/freescale/common/cadmus.h +++ b/board/freescale/common/cadmus.h @@ -6,7 +6,6 @@ #ifndef __CADMUS_H_ #define __CADMUS_H_ - /* * CADMUS Board System Register interface. */ @@ -21,17 +20,14 @@ extern unsigned int get_board_version(void); */ extern unsigned long get_board_sys_clk(void); - /* * Returns 1 - 4, as found in the USER CSR[6:7] bits. */ extern unsigned int get_pci_slot(void); - /* * Returns PCI DUAL as found in CM_PCI[3]. */ extern unsigned int get_pci_dual(void); - #endif /* __CADMUS_H_ */ diff --git a/board/freescale/common/eeprom.h b/board/freescale/common/eeprom.h index 328fd3974b1..1d0685fde67 100644 --- a/board/freescale/common/eeprom.h +++ b/board/freescale/common/eeprom.h @@ -6,12 +6,10 @@ #ifndef __EEPROM_H_ #define __EEPROM_H_ - /* * EEPROM Board System Register interface. */ - /* * CPU Board Revision */ @@ -29,5 +27,4 @@ */ extern unsigned int get_cpu_board_revision(void); - #endif /* __CADMUS_H_ */ diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index e03434dcdfe..657f4533bcd 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -327,7 +327,6 @@ static u32 read_validate_ie_tbl(struct fsl_secboot_img_priv *img) } #endif - /* This function return length of public key.*/ static inline u32 get_key_len(struct fsl_secboot_img_priv *img) { @@ -858,7 +857,6 @@ static int secboot_init(struct fsl_secboot_img_priv **img_ptr) return 0; } - /* haddr - Address of the header of image to be validated. * arg_hash_str - Option hash string. If provided, this * overrides the key hash in the SFP fuses. diff --git a/board/freescale/imx8mn_evk/ddr4_timing.c b/board/freescale/imx8mn_evk/ddr4_timing.c index 77611ea0260..ce39c9e2bcf 100644 --- a/board/freescale/imx8mn_evk/ddr4_timing.c +++ b/board/freescale/imx8mn_evk/ddr4_timing.c @@ -787,7 +787,6 @@ struct dram_cfg_param ddr_fsp1_cfg[] = { { 0xd0000, 0x1 }, }; - /* P0 2D message block paremeter for training firmware */ struct dram_cfg_param ddr_fsp0_2d_cfg[] = { { 0xd0000, 0x0 }, diff --git a/board/freescale/imx8mn_evk/ddr4_timing_ld.c b/board/freescale/imx8mn_evk/ddr4_timing_ld.c index a3577efd0b2..d719b5916f5 100644 --- a/board/freescale/imx8mn_evk/ddr4_timing_ld.c +++ b/board/freescale/imx8mn_evk/ddr4_timing_ld.c @@ -765,7 +765,6 @@ struct dram_cfg_param ddr_fsp0_cfg[] = { { 0xd0000, 0x1 }, }; - /* P1 message block paremeter for training firmware */ struct dram_cfg_param ddr_fsp1_cfg[] = { { 0xd0000, 0x0 }, @@ -791,7 +790,6 @@ struct dram_cfg_param ddr_fsp1_cfg[] = { { 0xd0000, 0x1 }, }; - /* P0 2D message block paremeter for training firmware */ struct dram_cfg_param ddr_fsp0_2d_cfg[] = { { 0xd0000, 0x0 }, diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index 7f8001b4981..5f0564f1b23 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -147,7 +147,6 @@ int dram_init(void) } #endif - int board_early_init_f(void) { fsl_lsch2_early_init_f(); diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c index 7abc4126933..2fdac87bc29 100644 --- a/board/freescale/ls1021aiot/ls1021aiot.c +++ b/board/freescale/ls1021aiot/ls1021aiot.c @@ -33,7 +33,6 @@ DECLARE_GLOBAL_DATA_PTR; #define DDR_SIZE 0x40000000 - int checkboard(void) { puts("Board: LS1021AIOT\n"); diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index fdf011efc5b..2ecf5a74a03 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -508,7 +508,6 @@ int config_serdes_mux(void) return 0; } - #ifdef CONFIG_MISC_INIT_R int misc_init_r(void) { diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c index d2e239c4d61..54b432ad794 100644 --- a/board/freescale/ls1088a/ddr.c +++ b/board/freescale/ls1088a/ddr.c @@ -94,7 +94,6 @@ found: popts->wrlvl_override = 1; popts->wrlvl_sample = 0xf; - /* Enable ZQ calibration */ popts->zq_en = 1; diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c index 2986ffb7a82..d19c061e122 100644 --- a/board/freescale/ls2080aqds/ddr.c +++ b/board/freescale/ls2080aqds/ddr.c @@ -46,7 +46,6 @@ void fsl_ddr_board_options(memctl_options_t *popts, else pbsp = udimms[ctrl_num]; - /* Get clk_adjust, wrlvl_start, wrlvl_ctl, according to the board ddr * freqency and n_banks specified in board_specific_parameters table. */ diff --git a/board/freescale/ls2080aqds/ddr.h b/board/freescale/ls2080aqds/ddr.h index b5d790a4a05..465155e56bf 100644 --- a/board/freescale/ls2080aqds/ddr.h +++ b/board/freescale/ls2080aqds/ddr.h @@ -87,5 +87,4 @@ static const struct board_specific_parameters *rdimms[] = { rdimm2, }; - #endif diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c index ec34b42e619..a1a97f9f8c2 100644 --- a/board/freescale/ls2080ardb/ddr.c +++ b/board/freescale/ls2080ardb/ddr.c @@ -46,7 +46,6 @@ void fsl_ddr_board_options(memctl_options_t *popts, else pbsp = udimms[ctrl_num]; - /* Get clk_adjust, wrlvl_start, wrlvl_ctl, according to the board ddr * freqency and n_banks specified in board_specific_parameters table. */ diff --git a/board/freescale/ls2080ardb/ddr.h b/board/freescale/ls2080ardb/ddr.h index c5f2a95211b..43301dc72a3 100644 --- a/board/freescale/ls2080ardb/ddr.h +++ b/board/freescale/ls2080ardb/ddr.h @@ -72,5 +72,4 @@ static const struct board_specific_parameters *rdimms[] = { udimm2, /* DP-DDR doesn't support RDIMM */ }; - #endif diff --git a/board/freescale/m5249evb/m5249evb.c b/board/freescale/m5249evb/m5249evb.c index 717dc087e02..68524e5e682 100644 --- a/board/freescale/m5249evb/m5249evb.c +++ b/board/freescale/m5249evb/m5249evb.c @@ -32,7 +32,6 @@ int checkboard (void) { return 0; }; - int dram_init(void) { unsigned long junk = 0xa5a59696; @@ -91,7 +90,6 @@ int dram_init(void) return 0; }; - int testdram(void) { /* TODO: XXX XXX XXX */ diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c index d0b01f81745..446a79e6723 100644 --- a/board/freescale/m5253demo/m5253demo.c +++ b/board/freescale/m5253demo/m5253demo.c @@ -133,7 +133,6 @@ void ide_set_reset(int idereset) } #endif /* CONFIG_IDE */ - #ifdef CONFIG_DRIVER_DM9000 int board_eth_init(struct bd_info *bis) { diff --git a/board/freescale/m5275evb/m5275evb.c b/board/freescale/m5275evb/m5275evb.c index e1d94fc9a3e..8b986d42425 100644 --- a/board/freescale/m5275evb/m5275evb.c +++ b/board/freescale/m5275evb/m5275evb.c @@ -74,7 +74,6 @@ int dram_init(void) *((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696; *((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696; - out_be32(&sdp->sdmr, 0x018d0000); *((volatile unsigned long *)CFG_SYS_SDRAM_BASE) = 0xa5a59696; diff --git a/board/freescale/mpc8548cds/ddr.c b/board/freescale/mpc8548cds/ddr.c index 14202cd5a78..4b8ddcc3ae4 100644 --- a/board/freescale/mpc8548cds/ddr.c +++ b/board/freescale/mpc8548cds/ddr.c @@ -3,7 +3,6 @@ * Copyright 2008 Freescale Semiconductor, Inc. */ - #include <fsl_ddr_sdram.h> #include <fsl_ddr_dimm_params.h> diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index e782543c0fa..bab62fd4421 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -138,7 +138,6 @@ static void eim_clk_setup(void) struct mxc_ccm_reg *imx_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; int cscmr1, ccgr6; - /* Turn off EIM clock */ ccgr6 = readl(&imx_ccm->CCGR6); ccgr6 &= ~(0x3 << 10); @@ -170,7 +169,6 @@ static void setup_iomux_eimnor(void) } #endif - static iomux_v3_cfg_t const usdhc3_pads[] = { IOMUX_PADS(PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)), IOMUX_PADS(PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)), @@ -480,7 +478,6 @@ int power_init_board(void) if (ret != 0) return ret; - if (is_mx6dqp()) { /* set SW2 staby volatage 0.975V*/ value = pmic_reg_read(dev, PFUZE100_SW2STBY); diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c index 7114444fc3e..9e39e39ac90 100644 --- a/board/freescale/mx6sllevk/mx6sllevk.c +++ b/board/freescale/mx6sllevk/mx6sllevk.c @@ -54,7 +54,6 @@ int power_init_board(void) rev_id = pmic_reg_read(dev, PFUZE100_REVID); printf("PMIC: PFUZE100! DEV_ID=0x%x REV_ID=0x%x\n", dev_id, rev_id); - /* Init mode to APS_PFM */ pmic_reg_write(dev, PFUZE100_SW1ABMODE, APS_PFM); diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c index 6176f738238..d80cfd4ab27 100644 --- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c +++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c @@ -135,7 +135,6 @@ int power_init_board(void) rev_id = pmic_reg_read(dev, PFUZE100_REVID); printf("PMIC: PFUZE100! DEV_ID=0x%x REV_ID=0x%x\n", dev_id, rev_id); - /* Init mode to APS_PFM */ pmic_reg_write(dev, PFUZE100_SW1ABMODE, APS_PFM); diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index 6b0665a1067..e5a0197e2fd 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -108,7 +108,6 @@ static iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), }; - static void setup_iomux_uart(void) { imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); @@ -352,7 +351,6 @@ void board_preboot_os(void) #include <spl.h> #include <asm/arch/mx6-ddr.h> - static struct mx6ul_iomux_grp_regs mx6_grp_ioregs = { .grp_addds = 0x00000030, .grp_ddrmode_ctl = 0x00020000, diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index ab0031440ae..e386840d9ef 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -622,7 +622,6 @@ void board_reset(void) } #endif - int misc_init_r(void) { ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR); diff --git a/board/freescale/t102xrdb/cpld.h b/board/freescale/t102xrdb/cpld.h index bd40cc319a8..b504c3fcc47 100644 --- a/board/freescale/t102xrdb/cpld.h +++ b/board/freescale/t102xrdb/cpld.h @@ -23,7 +23,6 @@ struct cpld_data { u8 boot_config2; /* 0x1A - Boot config override register*/ }; - /* Pointer to the CPLD register set */ u8 cpld_read(unsigned int reg); diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c index d5c084e319d..c35ec368a45 100644 --- a/board/freescale/t104xrdb/eth.c +++ b/board/freescale/t104xrdb/eth.c @@ -84,7 +84,6 @@ int board_eth_init(struct bd_info *bis) DEFAULT_FM_MDIO_NAME)); } - cpu_eth_init(bis); #endif diff --git a/board/freescale/t208xqds/t208xqds_qixis.h b/board/freescale/t208xqds/t208xqds_qixis.h index 0f9a45a6fd4..66651422031 100644 --- a/board/freescale/t208xqds/t208xqds_qixis.h +++ b/board/freescale/t208xqds/t208xqds_qixis.h @@ -11,7 +11,6 @@ #define QIXIS_SRDS1CLK_122 0x5a #define QIXIS_SRDS1CLK_125 0x5e - /* BRDCFG4[4:7]] select EC1 and EC2 as a pair */ #define BRDCFG4_EMISEL_MASK 0xE0 #define BRDCFG4_EMISEL_SHIFT 5 diff --git a/board/freescale/t208xqds/tlb.c b/board/freescale/t208xqds/tlb.c index f99d51c8cd7..a4cc532acda 100644 --- a/board/freescale/t208xqds/tlb.c +++ b/board/freescale/t208xqds/tlb.c @@ -81,7 +81,6 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 5, BOOKE_PAGESZ_256M, 1), - /* *I*G* - PCIe 4, 0xc0000000 */ SET_TLB_ENTRY(1, CFG_SYS_PCIE4_MEM_VIRT, CFG_SYS_PCIE4_MEM_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, diff --git a/board/freescale/t208xrdb/tlb.c b/board/freescale/t208xrdb/tlb.c index df5831541f3..a9a03908dfb 100644 --- a/board/freescale/t208xrdb/tlb.c +++ b/board/freescale/t208xrdb/tlb.c @@ -81,7 +81,6 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 5, BOOKE_PAGESZ_256M, 1), - /* *I*G* - PCIe 4, 0xc0000000 */ SET_TLB_ENTRY(1, CFG_SYS_PCIE4_MEM_VIRT, CFG_SYS_PCIE4_MEM_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c index 5b60b50c672..bbe31d4a54e 100644 --- a/board/freescale/t4rdb/ddr.c +++ b/board/freescale/t4rdb/ddr.c @@ -39,7 +39,6 @@ void fsl_ddr_board_options(memctl_options_t *popts, else pbsp = udimms[0]; - /* Get clk_adjust, cpo, write_data_delay,2T, according to the board ddr * freqency and n_banks specified in board_specific_parameters table. */ diff --git a/board/freescale/t4rdb/ddr.h b/board/freescale/t4rdb/ddr.h index 74a27796114..241b13475da 100644 --- a/board/freescale/t4rdb/ddr.h +++ b/board/freescale/t4rdb/ddr.h @@ -73,5 +73,4 @@ static const struct board_specific_parameters *rdimms[] = { rdimm0, }; - #endif diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c index 80a798af9cb..bfb49ad8604 100644 --- a/board/freescale/vf610twr/vf610twr.c +++ b/board/freescale/vf610twr/vf610twr.c @@ -214,7 +214,6 @@ static void setup_iomux_nfc(void) } #endif - static void setup_iomux_qspi(void) { static const iomux_v3_cfg_t qspi0_pads[] = { diff --git a/board/gdsys/common/dp501.c b/board/gdsys/common/dp501.c index 7698e76b524..715544c31ec 100644 --- a/board/gdsys/common/dp501.c +++ b/board/gdsys/common/dp501.c @@ -136,7 +136,6 @@ void dp501_powerdown(u8 addr) dp501_setbits(addr, 0x0a, 0x30); /* power down encoder, standby mode */ } - int dp501_probe(unsigned screen, bool power) { #ifdef CONFIG_SYS_DP501_BASE diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c index f01b48b5c8e..eea486a03fb 100644 --- a/board/gdsys/common/ioep-fpga.c +++ b/board/gdsys/common/ioep-fpga.c @@ -6,7 +6,6 @@ #ifdef CONFIG_GDSYS_LEGACY_DRIVERS - #include <gdsys_fpga.h> #include <linux/bitops.h> diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c index bd9c5ca9969..915b733547f 100644 --- a/board/gdsys/common/osd.c +++ b/board/gdsys/common/osd.c @@ -165,7 +165,6 @@ static unsigned int ics8n3qv01_get_fout_calc(unsigned index) return fout_calc; } - static void ics8n3qv01_calc_parameters(unsigned int fout, unsigned int *_mint, unsigned int *_mfrac, unsigned int *_n) @@ -424,7 +423,6 @@ int osd_write(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) y = hextoul(argv[2], NULL); rp = argv[3]; - while (*rp) { char substr[5]; diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c index 2d8951964a8..e1d08475e94 100644 --- a/board/ge/bx50v3/bx50v3.c +++ b/board/ge/bx50v3/bx50v3.c @@ -434,7 +434,6 @@ static const struct boot_mode board_boot_modes[] = { }; #endif - /* * The SoM used by these boards has XTAL not connected despite datasheet * suggesting connecting unused XTAL pins to ground. Without explicitly diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index 95a831efcaf..29165266630 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -244,7 +244,6 @@ static int config_sd_carddetect(void) return 0; } - static void mmc1_init_pll(void) { uint32_t data; @@ -339,7 +338,6 @@ static void mmc0_reset_clk(void) } while (data & PERI_RST0_MMC0); } - /* PMU SSI is the IP that maps the external PMU hi6553 registers as IO */ static void hi6220_pmussi_init(void) { @@ -398,7 +396,6 @@ static int init_dwmmc(void) if (ret) printf("%s: Error adding eMMC port (%d)\n", __func__, ret); - /* take mmc1 (sd slot) out of reset, configure clocks and pinmuxing */ mmc1_init_pll(); mmc1_reset_clk(); diff --git a/board/is1/qts/iocsr_config.h b/board/is1/qts/iocsr_config.h index e54af2caed4..619b8a6706e 100644 --- a/board/is1/qts/iocsr_config.h +++ b/board/is1/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x00004000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/is1/qts/pll_config.h b/board/is1/qts/pll_config.h index 0a5f5dd196f..95a4fb6305e 100644 --- a/board/is1/qts/pll_config.h +++ b/board/is1/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 4 #define CFG_HPS_ALTERAGRP_DBGATCLK 4 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/kontron/pitx_imx8m/pitx_imx8m.c b/board/kontron/pitx_imx8m/pitx_imx8m.c index a908aee9ecc..2ee97169c6f 100644 --- a/board/kontron/pitx_imx8m/pitx_imx8m.c +++ b/board/kontron/pitx_imx8m/pitx_imx8m.c @@ -84,7 +84,6 @@ int board_phys_sdram_size(phys_size_t *memsize) return 0; } - #ifdef CONFIG_FEC_MXC #define FEC_RST_PAD IMX_GPIO_NR(1, 11) static iomux_v3_cfg_t const fec1_rst_pads[] = { diff --git a/board/kontron/pitx_imx8m/spl.c b/board/kontron/pitx_imx8m/spl.c index 475e52f6231..bd5981bf694 100644 --- a/board/kontron/pitx_imx8m/spl.c +++ b/board/kontron/pitx_imx8m/spl.c @@ -28,7 +28,6 @@ extern struct dram_timing_info dram_timing_4gb; DECLARE_GLOBAL_DATA_PTR; - static void spl_dram_init(void) { struct dram_timing_info *dram_timing; @@ -89,7 +88,6 @@ int board_mmc_getcd(struct mmc *mmc) return 0; } - #define USDHC_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE | \ PAD_CTL_FSEL2) #define USDHC_GPIO_PAD_CTRL (PAD_CTL_PUE | PAD_CTL_DSE1) diff --git a/board/l+g/vinco/vinco.c b/board/l+g/vinco/vinco.c index 066d315baa2..39e7ff633b3 100644 --- a/board/l+g/vinco/vinco.c +++ b/board/l+g/vinco/vinco.c @@ -62,7 +62,6 @@ static void vinco_spi0_hw_init(void) } #endif /* CONFIG_ATMEL_SPI */ - #ifdef CONFIG_CMD_USB static void vinco_usb_hw_init(void) { @@ -72,7 +71,6 @@ static void vinco_usb_hw_init(void) } #endif - #ifdef CONFIG_GENERIC_ATMEL_MCI void vinco_mci0_hw_init(void) { diff --git a/board/logicpd/omap3som/omap3logic.h b/board/logicpd/omap3som/omap3logic.h index ba63aa04c34..55d8f429513 100644 --- a/board/logicpd/omap3som/omap3logic.h +++ b/board/logicpd/omap3som/omap3logic.h @@ -19,7 +19,6 @@ #define NET_LAN92XX_GPMC_CONFIG5 0x00080a0a #define NET_LAN92XX_GPMC_CONFIG6 0x03000280 - const omap3_sysinfo sysinfo = { DDR_DISCRETE, "Logic DM37x/OMAP35x reference board", diff --git a/board/mntre/imx8mq_reform2/imx8mq_reform2.c b/board/mntre/imx8mq_reform2/imx8mq_reform2.c index ebc490e24b1..6ee1c5c52a1 100644 --- a/board/mntre/imx8mq_reform2/imx8mq_reform2.c +++ b/board/mntre/imx8mq_reform2/imx8mq_reform2.c @@ -28,14 +28,12 @@ DECLARE_GLOBAL_DATA_PTR; - #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE) static iomux_v3_cfg_t const wdog_pads[] = { IMX8MQ_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; - int board_early_init_f(void) { struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; diff --git a/board/mntre/imx8mq_reform2/lpddr4_timing.c b/board/mntre/imx8mq_reform2/lpddr4_timing.c index e5303db0f80..96d2a3fc6c7 100644 --- a/board/mntre/imx8mq_reform2/lpddr4_timing.c +++ b/board/mntre/imx8mq_reform2/lpddr4_timing.c @@ -312,7 +312,6 @@ static struct dram_cfg_param lpddr4_fsp0_cfg[] = { { 0xd0000, 1 }, }; - /* P1 message block parameter for training firmware */ static struct dram_cfg_param lpddr4_fsp1_cfg[] = { { 0xd0000, 0 }, @@ -352,7 +351,6 @@ static struct dram_cfg_param lpddr4_fsp1_cfg[] = { { 0xd0000, 1 }, }; - /* P0 2D message block parameter for training firmware */ static struct dram_cfg_param lpddr4_fsp0_2d_cfg[] = { { 0xd0000, 0 }, diff --git a/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c b/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c index 0cbfc08183c..1c63277d928 100644 --- a/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c +++ b/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c @@ -254,7 +254,6 @@ unsigned long ps7_reset_apu_3_0[] = { EMIT_EXIT(), }; - int ps7_post_config(void) { return ps7_config(ps7_post_config_3_0); diff --git a/board/phytec/phycore_am62x/phycore_am62x.env b/board/phytec/phycore_am62x/phycore_am62x.env index 2d6475d408f..046bbd22f25 100644 --- a/board/phytec/phycore_am62x/phycore_am62x.env +++ b/board/phytec/phycore_am62x/phycore_am62x.env @@ -1,4 +1,5 @@ #include <env/ti/k3_dfu.env> +#include <env/phytec/k3_mmc.env> fdtaddr=0x88000000 loadaddr=0x82000000 @@ -14,13 +15,3 @@ mmcroot=2 mmcpart=1 console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000 -mmcargs=setenv bootargs console=${console} earlycon=${earlycon} - root=/dev/mmcblk${mmcdev}p${mmcroot} rootwait rw -loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} Image -loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdtaddr} ${fdtfile} -mmcboot=run mmcargs; - mmc dev ${mmcdev}; - mmc rescan; - run loadimage; - run loadfdt; - booti ${loadaddr} - ${fdtaddr} diff --git a/board/phytec/phycore_am64x/phycore_am64x.env b/board/phytec/phycore_am64x/phycore_am64x.env index e24a958f51d..18f0fa5b4c3 100644 --- a/board/phytec/phycore_am64x/phycore_am64x.env +++ b/board/phytec/phycore_am64x/phycore_am64x.env @@ -1,3 +1,5 @@ +#include <env/phytec/k3_mmc.env> + fdtaddr=0x88000000 loadaddr=0x82000000 scriptaddr=0x80000000 @@ -12,13 +14,3 @@ mmcroot=2 mmcpart=1 console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000 -mmcargs=setenv bootargs console=${console} earlycon=${earlycon} - root=/dev/mmcblk${mmcdev}p${mmcroot} rootwait rw -loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} Image -loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdtaddr} ${fdtfile} -mmcboot=run mmcargs; - mmc dev ${mmcdev}; - mmc rescan; - run loadimage; - run loadfdt; - booti ${loadaddr} - ${fdtaddr} diff --git a/board/phytec/phycore_imx8mp/phycore_imx8mp.env b/board/phytec/phycore_imx8mp/phycore_imx8mp.env index 7f6c5fd2c76..f8f878e8f3a 100644 --- a/board/phytec/phycore_imx8mp/phycore_imx8mp.env +++ b/board/phytec/phycore_imx8mp/phycore_imx8mp.env @@ -1,4 +1,5 @@ #include <env/phytec/rauc.env> +#include <env/phytec/overlays.env> bootcmd= if test ${dofastboot} = 1; then @@ -16,15 +17,17 @@ bootcmd= fi; fi; console=ttymxc0,115200 +bootenv_addr_r=0x49100000 +fdtoverlay_addr_r=0x49000000 dofastboot=0 emmc_dev=2 fastboot_raw_partition_all=0 4194304 fastboot_raw_partition_bootloader=64 8128 -fdt_addr=0x48000000 -fdt_file=CONFIG_DEFAULT_FDT_FILE +fdt_addr_r=0x48000000 +fdtfile=CONFIG_DEFAULT_FDT_FILE image=Image ip_dyn=yes -loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file} +loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile} loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} mmcargs= setenv bootargs console=${console} @@ -32,9 +35,15 @@ mmcargs= mmcautodetect=yes mmcboot= echo Booting from mmc ...; + if test ${no_bootenv} = 0; then + if run mmc_load_bootenv; then + env import -t ${bootenv_addr_r} ${filesize}; + fi; + fi; run mmcargs; if run loadfdt; then - booti ${loadaddr} - ${fdt_addr}; + run mmc_apply_overlays; + booti ${loadaddr} - ${fdt_addr_r}; else echo WARN: Cannot load the DT; fi; @@ -51,10 +60,16 @@ netboot= else setenv get_cmd tftp; fi; + if test ${no_bootenv} = 0; then + if run net_load_bootenv; then + env import -t ${bootenv_addr_r} ${filesize}; + fi; + fi; ${get_cmd} ${loadaddr} ${image}; run netargs; - if ${get_cmd} ${fdt_addr} ${fdt_file}; then - booti ${loadaddr} - ${fdt_addr}; + if ${get_cmd} ${fdt_addr_r} ${fdtfile}; then + run net_apply_overlays; + booti ${loadaddr} - ${fdt_addr_r}; else echo WARN: Cannot load the DT; fi; diff --git a/board/phytec/phycore_imx93/phycore_imx93.env b/board/phytec/phycore_imx93/phycore_imx93.env index 27bfadfa140..ab65cfce5fd 100644 --- a/board/phytec/phycore_imx93/phycore_imx93.env +++ b/board/phytec/phycore_imx93/phycore_imx93.env @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +#include <env/phytec/overlays.env> + image=Image console=ttyLP0 -fdt_addr=0x83000000 -fdto_addr=0x830c0000 -bootenv_addr=0x83500000 -fdt_file=CONFIG_DEFAULT_FDT_FILE +fdt_addr_r=0x83000000 +fdtoverlay_addr_r=0x830c0000 +bootenv_addr_r=0x83500000 +fdtfile=CONFIG_DEFAULT_FDT_FILE ip_dyn=yes -bootenv=bootenv.txt -mmc_load_bootenv=fatload mmc ${mmcdev}:${mmcpart} ${bootenv_addr} ${bootenv} mmcdev=CONFIG_SYS_MMC_ENV_DEV mmcpart=1 mmcroot=2 @@ -16,43 +16,22 @@ mmcautodetect=yes mmcargs=setenv bootargs console=${console},${baudrate} earlycon root=/dev/mmcblk${mmcdev}p${mmcroot} ${raucargs} rootwait rw loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} -loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file} -mmc_load_overlay=fatload mmc ${mmcdev}:${mmcpart} ${fdto_addr} ${overlay} -mmc_apply_overlays= - fdt address ${fdt_addr}; - for overlay in ${overlays}; - do; - if run mmc_load_overlay; then - fdt resize ${filesize}; - fdt apply ${fdto_addr}; - fi; - done; +loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile} mmcboot= echo Booting from mmc ...; if run mmc_load_bootenv; then - env import -t ${bootenv_addr} ${filesize}; + env import -t ${bootenv_addr_r} ${filesize}; fi; run mmcargs; if run loadfdt; then run mmc_apply_overlays; - booti ${loadaddr} - ${fdt_addr}; + booti ${loadaddr} - ${fdt_addr_r}; else echo WARN: Cannot load the DT; fi; nfsroot=/nfs netargs=setenv bootargs console=${console},${baudrate} earlycon root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp -net_load_bootenv=${get_cmd} ${bootenv_addr} ${bootenv} -net_load_overlay=${get_cmd} ${fdto_addr} ${overlay} -net_apply_overlays= - fdt address ${fdt_addr}; - for overlay in ${overlays}; - do; - if run net_load_overlay; then - fdt resize ${filesize}; - fdt apply ${fdto_addr}; - fi; - done; netboot= echo Booting from net ...; run netargs; @@ -62,12 +41,12 @@ netboot= setenv get_cmd tftp; fi; if run net_load_bootenv; then - env import -t ${bootenv_addr} ${filesize}; + env import -t ${bootenv_addr_r} ${filesize}; fi; ${get_cmd} ${loadaddr} ${image}; - if ${get_cmd} ${fdt_addr} ${fdt_file}; then + if ${get_cmd} ${fdt_addr_r} ${fdtfile}; then run net_apply_overlays; - booti ${loadaddr} - ${fdt_addr}; + booti ${loadaddr} - ${fdt_addr_r}; else echo WARN: Cannot load the DT; fi; diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c index bd2e213b3bc..fcbf2c3fe60 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.c +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c @@ -115,7 +115,6 @@ int ft_board_setup(void *blob, struct bd_info *bd) do_fixup_by_compat(blob, "qcom,wcnss-wlan", "local-mac-address", mac, ARP_HLEN, 1); - if (!eth_env_get_enetaddr("btaddr", mac)) { msm_generate_mac_addr(mac); diff --git a/board/siemens/common/board_am335x.c b/board/siemens/common/board_am335x.c index 445af9ddbf6..2a727606bc3 100644 --- a/board/siemens/common/board_am335x.c +++ b/board/siemens/common/board_am335x.c @@ -22,7 +22,6 @@ DECLARE_GLOBAL_DATA_PTR; - #ifdef CONFIG_SPL_BUILD void set_uart_mux_conf(void) { diff --git a/board/siemens/pxm2/pmic.h b/board/siemens/pxm2/pmic.h index f4ce7f16b29..6990fd7ce87 100644 --- a/board/siemens/pxm2/pmic.h +++ b/board/siemens/pxm2/pmic.h @@ -50,7 +50,6 @@ #define PMIC_REG_ST_OFF_1 (0x2) #define PMIC_REG_ST_ON_LOW_POW (0x3) - /* VDD2 & VDD1 voltage selection register. (VDD2_OP_REG & VDD1_OP_REG) */ #define PMIC_OP_REG_SEL (0x7F) diff --git a/board/sifive/unmatched/unmatched.env b/board/sifive/unmatched/unmatched.env index 0f1e5a71747..34425dc9efa 100644 --- a/board/sifive/unmatched/unmatched.env +++ b/board/sifive/unmatched/unmatched.env @@ -16,4 +16,4 @@ partitions= name=loader1,start=17K,size=1M,type=${type_guid_gpt_loader1}; name=loader2,size=4MB,type=${type_guid_gpt_loader2}; name=system,size=-,bootable,type=${type_guid_gpt_system}; -fdtfile= CONFIG_DEFAULT_FDT_FILE +fdtfile=CONFIG_DEFAULT_FDT_FILE diff --git a/board/socrates/ddr.c b/board/socrates/ddr.c index bf4894eff67..317c6b0a9f5 100644 --- a/board/socrates/ddr.c +++ b/board/socrates/ddr.c @@ -3,7 +3,6 @@ * Copyright 2008 Freescale Semiconductor, Inc. */ - #include <fsl_ddr_sdram.h> #include <fsl_ddr_dimm_params.h> diff --git a/board/socrates/nand.c b/board/socrates/nand.c index 517a4a0af6a..b8e6e2cd76e 100644 --- a/board/socrates/nand.c +++ b/board/socrates/nand.c @@ -56,7 +56,6 @@ static void sc_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len) } } - /** * sc_nand_read_byte - read one byte from the chip * @mtd: MTD device structure diff --git a/board/socrates/sdram.c b/board/socrates/sdram.c index d0415d26ce7..00a3f2b31e7 100644 --- a/board/socrates/sdram.c +++ b/board/socrates/sdram.c @@ -14,7 +14,6 @@ #include <spd_sdram.h> #include <linux/delay.h> - #if !defined(CONFIG_SPD_EEPROM) /* * Autodetect onboard DDR SDRAM on 85xx platforms diff --git a/board/socrates/tlb.c b/board/socrates/tlb.c index 0cc675781d1..b4ddb1b1739 100644 --- a/board/socrates/tlb.c +++ b/board/socrates/tlb.c @@ -28,7 +28,6 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, 0, 0, 0, BOOKE_PAGESZ_4K, 0), - /* * TLB 1: 64M Non-cacheable, guarded * 0xfc000000 64M FLASH diff --git a/board/softing/vining_fpga/qts/iocsr_config.h b/board/softing/vining_fpga/qts/iocsr_config.h index 4059ed5ad12..62a25b9942e 100644 --- a/board/softing/vining_fpga/qts/iocsr_config.h +++ b/board/softing/vining_fpga/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x00004000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/softing/vining_fpga/qts/pll_config.h b/board/softing/vining_fpga/qts/pll_config.h index 40bc8f7f7c1..2b930fa9463 100644 --- a/board/softing/vining_fpga/qts/pll_config.h +++ b/board/softing/vining_fpga/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/sr1500/qts/iocsr_config.h b/board/sr1500/qts/iocsr_config.h index 2622b960314..f94769bcbd4 100644 --- a/board/sr1500/qts/iocsr_config.h +++ b/board/sr1500/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x00004000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/sr1500/qts/pll_config.h b/board/sr1500/qts/pll_config.h index 885fe91eeba..990432ac7f9 100644 --- a/board/sr1500/qts/pll_config.h +++ b/board/sr1500/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c index adec7d32199..ffa544fa963 100644 --- a/board/synopsys/emsdp/emsdp.c +++ b/board/synopsys/emsdp/emsdp.c @@ -76,7 +76,6 @@ int board_early_init_r(void) // Switch PSRAM controller back to memory mode writel(0, PSRAM_FLASH_CONFIG_REG_0); - // Switch PSRAM controller to command mode writel(CRE_ENABLE | CRE_DRIVE_CMD, PSRAM_FLASH_CONFIG_REG_1); // Program Refresh Configuration Register (RCR) for BANK1 diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c index 2e54ede62d6..484b4e24428 100644 --- a/board/tcl/sl50/board.c +++ b/board/tcl/sl50/board.c @@ -348,7 +348,6 @@ int board_eth_init(struct bd_info *bis) eth_env_set_enetaddr("eth1addr", mac_addr); } - writel(MII_MODE_ENABLE, &cdev->miisel); cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if = PHY_INTERFACE_MODE_MII; diff --git a/board/tcl/sl50/mux.c b/board/tcl/sl50/mux.c index 6d89c4a3998..2e2bd63f870 100644 --- a/board/tcl/sl50/mux.c +++ b/board/tcl/sl50/mux.c @@ -107,7 +107,6 @@ static struct module_pin_mux mii1_pin_mux[] = { {-1}, }; - void enable_uart0_pin_mux(void) { configure_module_pin_mux(uart0_pin_mux); diff --git a/board/terasic/de1-soc/qts/iocsr_config.h b/board/terasic/de1-soc/qts/iocsr_config.h index 359fd0e4173..46ef8288ed5 100644 --- a/board/terasic/de1-soc/qts/iocsr_config.h +++ b/board/terasic/de1-soc/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x00004000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/terasic/de1-soc/qts/pll_config.h b/board/terasic/de1-soc/qts/pll_config.h index 2811e04c480..ae3cd316743 100644 --- a/board/terasic/de1-soc/qts/pll_config.h +++ b/board/terasic/de1-soc/qts/pll_config.h @@ -86,5 +86,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/terasic/de10-nano/qts/iocsr_config.h b/board/terasic/de10-nano/qts/iocsr_config.h index a889d3da348..155550007a3 100644 --- a/board/terasic/de10-nano/qts/iocsr_config.h +++ b/board/terasic/de10-nano/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x00004000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/terasic/de10-nano/qts/pll_config.h b/board/terasic/de10-nano/qts/pll_config.h index 192ffb4e27b..794fa203d94 100644 --- a/board/terasic/de10-nano/qts/pll_config.h +++ b/board/terasic/de10-nano/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/terasic/de10-standard/qts/iocsr_config.h b/board/terasic/de10-standard/qts/iocsr_config.h index 4aed74e8b29..80086b0c293 100644 --- a/board/terasic/de10-standard/qts/iocsr_config.h +++ b/board/terasic/de10-standard/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x00004000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/terasic/de10-standard/qts/pll_config.h b/board/terasic/de10-standard/qts/pll_config.h index c1ecd4b8208..b09b6adfab0 100644 --- a/board/terasic/de10-standard/qts/pll_config.h +++ b/board/terasic/de10-standard/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 4 #define CFG_HPS_ALTERAGRP_DBGATCLK 4 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/terasic/sockit/qts/iocsr_config.h b/board/terasic/sockit/qts/iocsr_config.h index 7b72ae9c3c2..8c247c8dfe5 100644 --- a/board/terasic/sockit/qts/iocsr_config.h +++ b/board/terasic/sockit/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x00004000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/terasic/sockit/qts/pll_config.h b/board/terasic/sockit/qts/pll_config.h index 104e324d8a4..52f1eb0c7b4 100644 --- a/board/terasic/sockit/qts/pll_config.h +++ b/board/terasic/sockit/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c index cca5c3d33b5..d7234532fe6 100644 --- a/board/theadorable/theadorable.c +++ b/board/theadorable/theadorable.c @@ -288,7 +288,6 @@ int board_late_init(void) } } while (get_timer(start_time) < ABORT_TIMEOUT); - /* * At this stage the bootcounter has not been incremented * yet. We need to do this manually here to get an actually diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 34f4a919656..681002ba1da 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -339,7 +339,6 @@ static void scale_vcores_bone(int freq) if (power_tps65217_init(0)) return; - /* * On Beaglebone White we need to ensure we have AC power * before increasing the frequency. diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index 40b7fcfc387..431372954b2 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -336,7 +336,6 @@ const struct dpll_params *get_dpll_ddr_params(void) return NULL; } - /* * get_opp_offset: * Returns the index for safest OPP of the device to boot. diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 48668884bdd..cc5e64c9879 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -515,7 +515,6 @@ int get_voltrail_opp(int rail_offset) return opp; } - #ifdef CONFIG_SPL_BUILD /* No env to setup for SPL */ static inline void setup_board_eeprom_env(void) { } diff --git a/board/ti/ks2_evm/ddr3_cfg.c b/board/ti/ks2_evm/ddr3_cfg.c index fe350fee795..690c4e2731f 100644 --- a/board/ti/ks2_evm/ddr3_cfg.c +++ b/board/ti/ks2_evm/ddr3_cfg.c @@ -6,7 +6,6 @@ * Texas Instruments Incorporated, <www.ti.com> */ - #include <asm/arch/ddr3.h> #include "ddr3_cfg.h" diff --git a/board/ti/panda/panda_mux_data.h b/board/ti/panda/panda_mux_data.h index ad9e36525b4..3bf6c0146c2 100644 --- a/board/ti/panda/panda_mux_data.h +++ b/board/ti/panda/panda_mux_data.h @@ -11,7 +11,6 @@ #include <asm/arch/mux_omap4.h> - const struct pad_conf_entry core_padconf_array_essential[] = { {GPMC_AD0, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat0 */ diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 2dcc042ab26..4a1cfb89345 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -783,7 +783,6 @@ static void ccgr_init(void) writel(0x010E0101, &ccm->ccosr); } - #define PAD_CTL_INPUT_DDR BIT(17) struct mx6dq_iomux_ddr_regs mx6_ddr_ioregs = { @@ -951,7 +950,6 @@ static const struct mx6_ddr3_cfg ddr3_cfg_it = { .SRT = 1, }; - /* Perform DDR DRAM calibration */ static void spl_dram_perform_cal(const struct mx6_ddr_sysinfo *ddr_sysinfo) { diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 34e82c2b078..251970b99cc 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -759,7 +759,6 @@ MX6_MMDC_P0_MDMISC, 0x000b17c0, */ MX6_MMDC_P0_MDSCR, 0x00008000, - /* 800mhz_2x64mx16.cfg */ MX6_MMDC_P0_MDPDC, 0x0002002D, @@ -891,7 +890,6 @@ MX6_MMDC_P0_MDMISC, 0x000b17c0, */ MX6_MMDC_P0_MDSCR, 0x00008000, - /* 800mhz_2x64mx16.cfg */ MX6_MMDC_P0_MDPDC, 0x0002002D, diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index e966ffbf781..7de29e3abfb 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -223,7 +223,6 @@ int power_init_board(void) int reg, ver; int ret; - ret = pmic_get("pmic@33", &dev); if (ret) return ret; diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index 2c91e9fac43..cea25f8c900 100644 --- a/board/vscom/baltos/board.c +++ b/board/vscom/baltos/board.c @@ -285,7 +285,6 @@ int ft_board_setup(void *blob, struct bd_info *bd) mac_addr[4] = header.MAC1[4]; mac_addr[5] = header.MAC1[5]; - node = fdt_path_offset(blob, "ethernet0"); if (node < 0) { printf("no ethernet0 path offset\n"); diff --git a/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c b/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c index 602a789e775..e7f1d6ef5ec 100644 --- a/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c @@ -4060,7 +4060,6 @@ unsigned long ps7_post_config_3_0[] = { // }; - unsigned long ps7_pll_init_data_2_0[] = { // START: top // .. START: SLCR SETTINGS @@ -8263,7 +8262,6 @@ unsigned long ps7_post_config_2_0[] = { // }; - unsigned long ps7_pll_init_data_1_0[] = { // START: top // .. START: SLCR SETTINGS diff --git a/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c index 9343683f4d7..48001269cd7 100644 --- a/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c @@ -4167,7 +4167,6 @@ unsigned long ps7_post_config_3_0[] = { // }; - unsigned long ps7_pll_init_data_2_0[] = { // START: top // .. START: SLCR SETTINGS @@ -8483,7 +8482,6 @@ unsigned long ps7_post_config_2_0[] = { // }; - unsigned long ps7_pll_init_data_1_0[] = { // START: top // .. START: SLCR SETTINGS diff --git a/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c index 6b153aa3796..76ef5d9323e 100644 --- a/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c @@ -4136,7 +4136,6 @@ unsigned long ps7_post_config_3_0[] = { // }; - unsigned long ps7_pll_init_data_2_0[] = { // START: top // .. START: SLCR SETTINGS @@ -8421,7 +8420,6 @@ unsigned long ps7_post_config_2_0[] = { // }; - unsigned long ps7_pll_init_data_1_0[] = { // START: top // .. START: SLCR SETTINGS diff --git a/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c index 6f2edf16c24..67642798b41 100644 --- a/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c @@ -4026,7 +4026,6 @@ unsigned long ps7_post_config_3_0[] = { // }; - unsigned long ps7_pll_init_data_2_0[] = { // START: top // .. START: SLCR SETTINGS @@ -8195,7 +8194,6 @@ unsigned long ps7_post_config_2_0[] = { // }; - unsigned long ps7_pll_init_data_1_0[] = { // START: top // .. START: SLCR SETTINGS diff --git a/board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c index 04d2e5f1375..6a3236ce2d2 100644 --- a/board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c @@ -4082,7 +4082,6 @@ unsigned long ps7_post_config_3_0[] = { /* */ }; - unsigned long ps7_pll_init_data_2_0[] = { /* START: top */ /* .. START: SLCR SETTINGS */ @@ -8313,7 +8312,6 @@ unsigned long ps7_post_config_2_0[] = { /* */ }; - unsigned long ps7_pll_init_data_1_0[] = { /* START: top */ /* .. START: SLCR SETTINGS */ @@ -12477,7 +12475,6 @@ unsigned long ps7_post_config_1_0[] = { /* */ }; - #include "xil_io.h" unsigned long *ps7_mio_init_data = ps7_mio_init_data_3_0; diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index 8dd4963bdc0..da7fe612ca0 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -13,6 +13,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mp-phyboard-pollux-rdk" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_TARGET_PHYCORE_IMX8MP=y +CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -51,8 +52,6 @@ CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="u-boot=> " -# CONFIG_CMD_EXPORTENV is not set -# CONFIG_CMD_IMPORTENV is not set # CONFIG_CMD_CRC32 is not set CONFIG_CMD_EEPROM=y CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2 @@ -76,6 +75,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index ac869296d52..8058d5ff1c3 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -294,7 +294,6 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv) return 0; } - static void ahci_print_info(struct ahci_uc_priv *uc_priv) { void __iomem *mmio = uc_priv->mmio_base; @@ -520,7 +519,6 @@ static int ahci_port_start(struct ahci_uc_priv *uc_priv, u8 port) return wait_spinup(port_mmio); } - static int ahci_device_data_io(struct ahci_uc_priv *uc_priv, u8 port, u8 *fis, int fis_len, u8 *buf, int buf_len, u8 is_write) { @@ -647,7 +645,6 @@ static int ata_scsiop_inquiry(struct ahci_uc_priv *uc_priv, return 0; } - /* * SCSI READ10/WRITE10 command operation. */ @@ -759,7 +756,6 @@ static int ata_scsiop_read_write(struct ahci_uc_priv *uc_priv, return 0; } - /* * SCSI READ CAPACITY10 command operation. */ @@ -790,7 +786,6 @@ static int ata_scsiop_read_capacity10(struct ahci_uc_priv *uc_priv, return 0; } - /* * SCSI READ CAPACITY16 command operation. */ @@ -817,7 +812,6 @@ static int ata_scsiop_read_capacity16(struct ahci_uc_priv *uc_priv, return 0; } - /* * SCSI TEST UNIT READY command operation. */ @@ -827,7 +821,6 @@ static int ata_scsiop_test_unit_ready(struct ahci_uc_priv *uc_priv, return (uc_priv->ataid[pccb->target]) ? 0 : -EPERM; } - static int ahci_scsi_exec(struct udevice *dev, struct scsi_cmd *pccb) { struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev->parent); diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c index 690fb5a4d7b..2fd794f76c6 100644 --- a/drivers/bios_emulator/besys.c +++ b/drivers/bios_emulator/besys.c @@ -422,7 +422,6 @@ static u32 BE_accessReg(int regOffset, u32 value, int func) u16 val16; u32 val32; - /* Decode the configuration register values for the register we wish to * access */ diff --git a/drivers/bios_emulator/include/x86emu/debug.h b/drivers/bios_emulator/include/x86emu/debug.h index 859b54d8600..1c043b78ba4 100644 --- a/drivers/bios_emulator/include/x86emu/debug.h +++ b/drivers/bios_emulator/include/x86emu/debug.h @@ -105,7 +105,6 @@ #ifdef CONFIG_X86EMU_DEBUG - # define DECODE_PRINTF(x) if (DEBUG_DECODE()) \ x86emu_decode_printf(x) # define DECODE_PRINTF2(x,y) if (DEBUG_DECODE()) \ diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c index b3cccb17f20..afe9a40a322 100644 --- a/drivers/bios_emulator/x86emu/prim_ops.c +++ b/drivers/bios_emulator/x86emu/prim_ops.c @@ -97,7 +97,6 @@ * ****************************************************************************/ - #define PRIM_OPS_NO_REDEFINE_ASM #include "x86emu/x86emui.h" @@ -120,7 +119,6 @@ static u32 x86emu_parity_tab[8] = /*----------------------------- Implementation ----------------------------*/ - /*--------- Side effects helper functions -------*/ /**************************************************************************** diff --git a/drivers/block/ide.c b/drivers/block/ide.c index b16623d7a3a..cab5e1bc92b 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -790,7 +790,6 @@ static ulong ide_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, pwrsave = 1; } - while (blkcnt-- > 0) { c = ide_wait(device, IDE_TIME_OUT); diff --git a/drivers/cache/cache-l2x0.c b/drivers/cache/cache-l2x0.c index c7bdd9d064a..8b29af42338 100644 --- a/drivers/cache/cache-l2x0.c +++ b/drivers/cache/cache-l2x0.c @@ -62,7 +62,6 @@ static int l2x0_probe(struct udevice *dev) return 0; } - static const struct udevice_id l2x0_ids[] = { { .compatible = "arm,pl310-cache" }, {} diff --git a/drivers/cache/sandbox_cache.c b/drivers/cache/sandbox_cache.c index 2e20b83ab80..375892fafb0 100644 --- a/drivers/cache/sandbox_cache.c +++ b/drivers/cache/sandbox_cache.c @@ -27,7 +27,6 @@ static int snadbox_disable(struct udevice *dev) return 0; } - static const struct cache_ops sandbox_cache_ops = { .get_info = sandbox_get_info, .enable = sandbox_enable, diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index 4c832f1a530..c48a62ba099 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -130,7 +130,6 @@ static int clk_get_by_indexed_prop(struct udevice *dev, const char *prop_name, return log_ret(ret); } - return clk_get_by_index_tail(ret, dev_ofnode(dev), &args, "clocks", index, clk); } diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c index 59999266148..97f3b999d7c 100644 --- a/drivers/clk/clk_zynqmp.c +++ b/drivers/clk/clk_zynqmp.c @@ -109,7 +109,6 @@ static const resource_size_t zynqmp_crl_apb_clkc_base = 0xff5e0020; #define PLLCTRL_PRE_SRC_SHFT 20 #define PLLCTRL_PRE_SRC_MASK (0x7 << PLLCTRL_PRE_SRC_SHFT) - #define NUM_MIO_PINS 77 enum zynqmp_clk { diff --git a/drivers/clk/imx/clk-imxrt1170.c b/drivers/clk/imx/clk-imxrt1170.c index 20b9dc31500..88a294f4165 100644 --- a/drivers/clk/imx/clk-imxrt1170.c +++ b/drivers/clk/imx/clk-imxrt1170.c @@ -113,8 +113,6 @@ static int imxrt1170_clk_probe(struct udevice *dev) /* Anatop clocks */ base = (void *)ofnode_get_addr(ofnode_by_compatible(ofnode_null(), "fsl,imxrt-anatop")); - - clk_dm(IMXRT1170_CLK_RCOSC_48M, imx_clk_fixed_factor("rcosc48M", "rcosc16M", 3, 1)); clk_dm(IMXRT1170_CLK_RCOSC_400M, @@ -122,7 +120,6 @@ static int imxrt1170_clk_probe(struct udevice *dev) clk_dm(IMXRT1170_CLK_RCOSC_48M_DIV2, imx_clk_fixed_factor("rcosc48M_div2", "rcosc48M", 1, 2)); - clk_dm(IMXRT1170_CLK_PLL_ARM, imx_clk_pllv3(IMX_PLLV3_SYS, "pll_arm", "osc", base + 0x200, 0xff)); diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c index 3911e033905..7ec78dc3a80 100644 --- a/drivers/clk/imx/clk-pll14xx.c +++ b/drivers/clk/imx/clk-pll14xx.c @@ -248,7 +248,6 @@ static ulong clk_pll1416x_set_rate(struct clk *clk, unsigned long drate) tmp |= BYPASS_MASK; writel(tmp, pll->base); - div_val = (rate->mdiv << MDIV_SHIFT) | (rate->pdiv << PDIV_SHIFT) | (rate->sdiv << SDIV_SHIFT); writel(div_val, pll->base + 0x4); diff --git a/drivers/clk/qcom/clock-qcom.c b/drivers/clk/qcom/clock-qcom.c index 3a9cf2a231f..79c7606a225 100644 --- a/drivers/clk/qcom/clock-qcom.c +++ b/drivers/clk/qcom/clock-qcom.c @@ -376,7 +376,6 @@ static int qcom_power_set(struct power_domain *pwr, bool on) !(value & GDSC_PWR_ON_MASK), GDSC_STATUS_POLL_TIMEOUT_US); - if (ret == -ETIMEDOUT) printf("WARNING: GDSC %lu is stuck during power on/off\n", pwr->id); diff --git a/drivers/clk/qcom/clock-qcs404.c b/drivers/clk/qcom/clock-qcs404.c index 70a1f648e58..8b11de03a7d 100644 --- a/drivers/clk/qcom/clock-qcs404.c +++ b/drivers/clk/qcom/clock-qcs404.c @@ -67,7 +67,6 @@ #define EMAC_PTP_CMD_RCGR (0x4e014) #define EMAC_CMD_RCGR (0x4e01c) - /* GPLL0 clock control registers */ #define GPLL0_STATUS_ACTIVE BIT(31) diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c index a4f6dd5a0f5..9137dbe69ce 100644 --- a/drivers/clk/rockchip/clk_rk3328.c +++ b/drivers/clk/rockchip/clk_rk3328.c @@ -334,7 +334,6 @@ void rk3328_configure_cpu(struct rk3328_cru *cru, aclkm_div << ACLKM_CORE_DIV_SHIFT); } - static ulong rk3328_i2c_get_clk(struct rk3328_cru *cru, ulong clk_id) { u32 div, con; diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c index c893447a1b1..6c7b4c97d67 100644 --- a/drivers/core/of_addr.c +++ b/drivers/core/of_addr.c @@ -401,7 +401,6 @@ out: return ret; } - static int __of_address_to_resource(const struct device_node *dev, const __be32 *addrp, u64 size, unsigned int flags, const char *name, struct resource *r) diff --git a/drivers/crypto/fsl/desc.h b/drivers/crypto/fsl/desc.h index 5705c4f9447..eb108a9628b 100644 --- a/drivers/crypto/fsl/desc.h +++ b/drivers/crypto/fsl/desc.h @@ -691,7 +691,6 @@ #define OP_ALG_RNG4_MAS (0x1f3 << OP_ALG_RNG4_SHIFT) #define OP_ALG_RNG4_SK (0x100 << OP_ALG_RNG4_SHIFT) - /* Structures for Protocol Data Blocks */ struct __packed pdb_ecdsa_verify { uint32_t pdb_hdr; diff --git a/drivers/crypto/fsl/error.c b/drivers/crypto/fsl/error.c index 7b232d94c2a..dfcf5dbab35 100644 --- a/drivers/crypto/fsl/error.c +++ b/drivers/crypto/fsl/error.c @@ -26,7 +26,6 @@ #define JRSTA_DECOERR_INDEX_MASK 0xff00 #define JRSTA_DECOERR_ERROR_MASK 0x00ff - static const struct { u8 value; const char *error_text; diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c index bd2af94bb0d..d3305a6c82d 100644 --- a/drivers/ddr/altera/sdram_arria10.c +++ b/drivers/ddr/altera/sdram_arria10.c @@ -645,7 +645,6 @@ static int of_sdram_firewall_setup(const void *blob) writel(0, &socfpga_noc_fw_ddr_mpu_fpga2sdram_base->enable); writel(0, &socfpga_noc_fw_ddr_l3_base->enable); - for (i = 0; i < ARRAY_SIZE(firewall_table); i++) { sprintf(name, "%s", firewall_table[i].prop_name); ret = fdtdec_get_int_array(blob, child, name, diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c index 7636e71a0a6..69937fc2d56 100644 --- a/drivers/ddr/altera/sequencer.c +++ b/drivers/ddr/altera/sequencer.c @@ -689,7 +689,6 @@ static void scc_mgr_apply_group_dm_out1_delay(struct socfpga_sdrseq *seq, } } - /* apply and load delay on both DQS and OCT out1 */ static void scc_mgr_apply_group_dqs_io_and_oct_out1(struct socfpga_sdrseq *seq, u32 write_group, u32 delay) @@ -2580,7 +2579,6 @@ static int rw_mgr_mem_calibrate_vfifo_center(struct socfpga_sdrseq *seq, &sticky_bit_chk, left_edge, right_edge, use_read_test); - /* Search for the right edge of the window for each bit */ ret = search_right_edge(seq, 0, rank_bgn, rw_group, rw_group, start_dqs, start_dqs_en, diff --git a/drivers/ddr/altera/sequencer.h b/drivers/ddr/altera/sequencer.h index 618ba00da64..96a6bac83b4 100644 --- a/drivers/ddr/altera/sequencer.h +++ b/drivers/ddr/altera/sequencer.h @@ -164,7 +164,6 @@ struct param_type { u32 write_correct_mask_vg; }; - /* global variable holder */ struct gbl_type { uint32_t phy_debug_mode_flags; diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c index 9f9aea804d9..f1dcba4603e 100644 --- a/drivers/ddr/fsl/arm_ddr_gen3.c +++ b/drivers/ddr/fsl/arm_ddr_gen3.c @@ -19,7 +19,6 @@ #error Invalid setting for CONFIG_CHIP_SELECTS_PER_CTRL #endif - /* * regs has the to-be-set values for DDR controller registers * ctrl_num is the DDR controller number diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c index 94a5e447d56..52a20504bd9 100644 --- a/drivers/ddr/fsl/interactive.c +++ b/drivers/ddr/fsl/interactive.c @@ -1209,7 +1209,6 @@ void ddr2_spd_dump(const ddr2_spd_eeprom_t *spd) for (i = 0; i < 18; i++) printf("%c", spd->mpart[i]); - printf("<<* 73 Manufacturer's Part Number *\n"); printf("%-3d-%3d: %02x %02x %s\n", 91, 92, spd->rev[0], spd->rev[1], @@ -1227,7 +1226,6 @@ void ddr2_spd_dump(const ddr2_spd_eeprom_t *spd) for (i = 0; i < 27; i++) printf("%02x", spd->mspec[i]); - printf("* 99 Manufacturer Specific Data *\n"); } #endif @@ -1946,7 +1944,6 @@ unsigned long long fsl_ddr_interactive(fsl_ddr_info_t *pinfo, int var_is_set) if (argc == 0) continue; - if (strcmp(argv[0], "help") == 0) { puts(usage); continue; @@ -2042,7 +2039,6 @@ unsigned long long fsl_ddr_interactive(fsl_ddr_info_t *pinfo, int var_is_set) debug("src_ctlr_num = %u, src_dimm_num = %u, dst_ctlr_num = %u, dst_dimm_num = %u, step_mask = %x\n", src_ctlr_num, src_dimm_num, dst_ctlr_num, dst_dimm_num, step_mask); - switch (step_mask) { case STEP_GET_SPD: @@ -2117,7 +2113,6 @@ unsigned long long fsl_ddr_interactive(fsl_ddr_info_t *pinfo, int var_is_set) if (error) continue; - /* Check arguments */ /* ERROR: If no steps were found */ diff --git a/drivers/ddr/fsl/lc_common_dimm_params.c b/drivers/ddr/fsl/lc_common_dimm_params.c index aaf9800b372..cc128112e4f 100644 --- a/drivers/ddr/fsl/lc_common_dimm_params.c +++ b/drivers/ddr/fsl/lc_common_dimm_params.c @@ -191,7 +191,6 @@ compute_cas_latency(const unsigned int ctrl_num, lowest_good_caslat); outpdimm->lowest_common_spd_caslat = lowest_good_caslat; - /* * Compute a common 'de-rated' CAS latency. * diff --git a/drivers/ddr/imx/phy/ddrphy_train.c b/drivers/ddr/imx/phy/ddrphy_train.c index ccc10df1845..2a2161dec33 100644 --- a/drivers/ddr/imx/phy/ddrphy_train.c +++ b/drivers/ddr/imx/phy/ddrphy_train.c @@ -78,7 +78,6 @@ int ddr_cfg_phy(struct dram_timing_info *dram_timing) dwc_ddrphy_apb_wr(0xd0000, 0x1); - fsp_msg++; } diff --git a/drivers/ddr/marvell/a38x/ddr3_init.c b/drivers/ddr/marvell/a38x/ddr3_init.c index 7c5147f4745..b28b2c73a8b 100644 --- a/drivers/ddr/marvell/a38x/ddr3_init.c +++ b/drivers/ddr/marvell/a38x/ddr3_init.c @@ -75,7 +75,6 @@ int ddr3_init(void) #endif } - status = ddr3_silicon_post_init(); if (MV_OK != status) { printf("DDR3 Post Init - FAILED 0x%x\n", status); @@ -89,7 +88,6 @@ int ddr3_init(void) return status; } - /* Post MC/PHY initializations */ mv_ddr_post_training_soc_config(ddr_type); diff --git a/drivers/ddr/marvell/a38x/ddr3_training.c b/drivers/ddr/marvell/a38x/ddr3_training.c index 790b01d031d..5b8747cc681 100644 --- a/drivers/ddr/marvell/a38x/ddr3_training.c +++ b/drivers/ddr/marvell/a38x/ddr3_training.c @@ -285,7 +285,6 @@ int ddr3_tip_tune_training_params(u32 dev_num, if (params->g_rtt_park != PARAM_UNDEFINED) g_rtt_park = params->g_rtt_park; - DEBUG_TRAINING_IP(DEBUG_LEVEL_INFO, ("DGL parameters: 0x%X 0x%X 0x%X 0x%X 0x%X 0x%X 0x%X 0x%X 0x%X 0x%X 0x%X 0x%X\n", g_zpri_data, g_znri_data, g_zpri_ctrl, g_znri_ctrl, g_zpodt_data, g_znodt_data, @@ -870,7 +869,6 @@ int ddr3_tip_validate_algo_components(u8 dev_num) return (status == 1) ? MV_OK : MV_NOT_INITIALIZED; } - int ddr3_pre_algo_config(void) { struct mv_ddr_topology_map *tm = mv_ddr_topology_map_get(); @@ -1114,7 +1112,6 @@ int ddr3_tip_bus_write(u32 dev_num, enum hws_access_type interface_access, mv_ddr_phy_write(phy_access, phy_id, phy_type, reg_addr, data_value, OPERATION_WRITE); } - /* * Phy read-modify-write */ @@ -1406,7 +1403,6 @@ int ddr3_tip_freq_set(u32 dev_num, enum hws_access_type access_type, t2t = (cs_num == 1) ? 0 : 1; } - if (ddr3_tip_dev_attr_get(dev_num, MV_ATTR_INTERLEAVE_WA) == 1) { /* Use 1T mode if 1:1 ratio configured */ if (config_func_info[dev_num].tip_get_clock_ratio(frequency) == 1) { diff --git a/drivers/ddr/marvell/a38x/ddr3_training_ip_def.h b/drivers/ddr/marvell/a38x/ddr3_training_ip_def.h index 8765df7cfbb..bdd7836b844 100644 --- a/drivers/ddr/marvell/a38x/ddr3_training_ip_def.h +++ b/drivers/ddr/marvell/a38x/ddr3_training_ip_def.h @@ -82,7 +82,6 @@ #define ADDR_SIZE_8GB 0x40000000 #define ADDR_SIZE_16GB 0x80000000 - enum hws_edge_compare { EDGE_PF, EDGE_FP, diff --git a/drivers/ddr/marvell/a38x/ddr3_training_leveling.c b/drivers/ddr/marvell/a38x/ddr3_training_leveling.c index 55abbad5a7a..bc58f55170c 100644 --- a/drivers/ddr/marvell/a38x/ddr3_training_leveling.c +++ b/drivers/ddr/marvell/a38x/ddr3_training_leveling.c @@ -1677,7 +1677,6 @@ static int mpr_rd_frmt_config( u32 val, mask; u8 cs_bitmask_inv; - if (dis_auto_refresh == 1) { ddr3_tip_if_write(0, ACCESS_TYPE_UNICAST, 0, ODPG_CTRL_CTRL_REG, ODPG_CTRL_AUTO_REFRESH_DIS << ODPG_CTRL_AUTO_REFRESH_OFFS, diff --git a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h index dff56338b19..e6b7cc5985e 100644 --- a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h +++ b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h @@ -79,7 +79,6 @@ #define MV_DEBUG_WL_FULL #endif - /* The following is a list of Marvell status */ #define MV_ERROR (-1) #define MV_OK (0x00) /* Operation succeeded */ diff --git a/drivers/ddr/marvell/a38x/mv_ddr_plat.c b/drivers/ddr/marvell/a38x/mv_ddr_plat.c index 8ec9fb0874e..fb69539ef4c 100644 --- a/drivers/ddr/marvell/a38x/mv_ddr_plat.c +++ b/drivers/ddr/marvell/a38x/mv_ddr_plat.c @@ -1144,7 +1144,6 @@ static int ddr3_fast_path_dynamic_cs_size_config(u32 cs_ena) uint64_t cs_mem_size = 0; uint64_t mem_total_size_c, cs_mem_size_c; - #ifdef DEVICE_MAX_DRAM_ADDRESS_SIZE u32 physical_mem_size; u32 max_mem_size = DEVICE_MAX_DRAM_ADDRESS_SIZE; diff --git a/drivers/ddr/marvell/a38x/mv_ddr_plat.h b/drivers/ddr/marvell/a38x/mv_ddr_plat.h index 01894f652cb..23f3dd62877 100644 --- a/drivers/ddr/marvell/a38x/mv_ddr_plat.h +++ b/drivers/ddr/marvell/a38x/mv_ddr_plat.h @@ -55,7 +55,6 @@ #define MARVELL_BOARD MARVELL_BOARD_ID_BASE - #define REG_DEVICE_SAR1_ADDR 0xe4204 #define RST2_CPU_DDR_CLOCK_SELECT_IN_OFFSET 17 #define RST2_CPU_DDR_CLOCK_SELECT_IN_MASK 0x1f diff --git a/drivers/ddr/marvell/a38x/mv_ddr_regs.h b/drivers/ddr/marvell/a38x/mv_ddr_regs.h index a19000dbdd8..6a8a921e534 100644 --- a/drivers/ddr/marvell/a38x/mv_ddr_regs.h +++ b/drivers/ddr/marvell/a38x/mv_ddr_regs.h @@ -520,5 +520,4 @@ enum { #define RESULT_PHY_RX_OFFS 5 #define RESULT_PHY_TX_OFFS 0 - #endif /* _MV_DDR_REGS_H */ diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index cfa6334e439..8f7ecfa8fc7 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -269,7 +269,6 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size) } } - static int mmc_file_buf_read(struct dfu_entity *dfu, u64 offset, void *buf, long *len) { diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c index 0cd9bcb5110..e5d242f4f8f 100644 --- a/drivers/dma/fsl_dma.c +++ b/drivers/dma/fsl_dma.c @@ -21,7 +21,6 @@ #define FSL_DMA_MR_DEFAULT (FSL_DMA_MR_BWC_DIS | FSL_DMA_MR_CTM_DIRECT) #endif - #if defined(CONFIG_MPC83xx) dma83xx_t *dma_base = (void *)(CFG_SYS_MPC83xx_DMA_ADDR); #elif defined(CONFIG_MPC85xx) diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index da341a24778..b7e674f2186 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -1710,7 +1710,6 @@ static int udma_probe(struct udevice *dev) struct udma_tisci_rm *tisci_rm = &ud->tisci_rm; ofnode navss_ofnode = ofnode_get_parent(dev_ofnode(dev)); - ud->match_data = (void *)dev_get_driver_data(dev); ret = udma_get_mmrs(dev); if (ret) diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 8ce0f46e70c..e591333ba38 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -139,7 +139,6 @@ static struct ti_sci_xfer *ti_sci_setup_one_xfer(struct ti_sci_info *info, return ERR_PTR(-ERANGE); } - info->seq = ~info->seq; xfer->tx_message.buf = buf; xfer->tx_message.len = tx_message_size; diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c index cb7877a8afe..3de9011ac06 100644 --- a/drivers/fpga/ACEX1K.c +++ b/drivers/fpga/ACEX1K.c @@ -79,7 +79,6 @@ int ACEX1K_info( Altera_desc *desc ) return FPGA_SUCCESS; } - /* ------------------------------------------------------------------------- */ /* ACEX1K Passive Serial Generic Implementation */ diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c index 38ba6c21ea2..1f6782537de 100644 --- a/drivers/fpga/fpga.c +++ b/drivers/fpga/fpga.c @@ -30,7 +30,6 @@ static void fpga_no_sup(char *fn, char *msg) printf("No FPGA support!\n"); } - /* fpga_get_desc * map a device number to a descriptor */ diff --git a/drivers/fpga/ivm_core.c b/drivers/fpga/ivm_core.c index b9cecdd8720..3c9a01e5110 100644 --- a/drivers/fpga/ivm_core.c +++ b/drivers/fpga/ivm_core.c @@ -580,7 +580,6 @@ void ispVMFreeMem(void) } } - /* * * ispVMDataSize diff --git a/drivers/fpga/lattice.c b/drivers/fpga/lattice.c index 036580cad70..3f481e38565 100644 --- a/drivers/fpga/lattice.c +++ b/drivers/fpga/lattice.c @@ -35,7 +35,6 @@ extern unsigned short g_usIntelDataIndex; extern unsigned short g_usIntelBufferSize; extern char *const g_szSupportedVersions[]; - /* * ispVMDelay * diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c index 9cd6cb7f0fb..906649ea181 100644 --- a/drivers/fpga/spartan2.c +++ b/drivers/fpga/spartan2.c @@ -85,7 +85,6 @@ static int spartan2_info(xilinx_desc *desc) return FPGA_SUCCESS; } - /* ------------------------------------------------------------------------- */ /* Spartan-II Slave Parallel Generic Implementation */ @@ -285,7 +284,6 @@ static int spartan2_sp_dump(xilinx_desc *desc, const void *buf, size_t bsize) return ret_val; } - /* ------------------------------------------------------------------------- */ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize) diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c index b4d87d47d93..98405589134 100644 --- a/drivers/fpga/spartan3.c +++ b/drivers/fpga/spartan3.c @@ -91,7 +91,6 @@ static int spartan3_info(xilinx_desc *desc) return FPGA_SUCCESS; } - /* ------------------------------------------------------------------------- */ /* Spartan-II Slave Parallel Generic Implementation */ @@ -293,7 +292,6 @@ static int spartan3_sp_dump(xilinx_desc *desc, const void *buf, size_t bsize) return ret_val; } - /* ------------------------------------------------------------------------- */ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize) diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c index 7ba1595e4ae..469c50a6016 100644 --- a/drivers/gpio/altera_pio.c +++ b/drivers/gpio/altera_pio.c @@ -59,7 +59,6 @@ static int altera_pio_get_value(struct udevice *dev, unsigned pin) return !!(readl(®s->data) & (1 << pin)); } - static int altera_pio_set_value(struct udevice *dev, unsigned pin, int val) { struct altera_pio_plat *plat = dev_get_plat(dev); diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c index 80ebaadb3e4..e84038f312e 100644 --- a/drivers/gpio/pca953x_gpio.c +++ b/drivers/gpio/pca953x_gpio.c @@ -39,7 +39,6 @@ #define PCA957X_INVERT 1 #define PCA957X_DIRECTION 4 - #define PCA_GPIO_MASK 0x00FF #define PCA_INT 0x0100 #define PCA_PCAL BIT(9) diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index 5e86474d3db..218ca2af397 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -157,7 +157,6 @@ void sunxi_gpio_set_pull_bank(void *bank_base, int pin_offset, u32 val) 0x3U << offset, val << offset); } - /* =========== Non-DM code, used by the SPL. ============ */ #if !CONFIG_IS_ENABLED(DM_GPIO) diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c index 9a364fdae37..2ab0bae4499 100644 --- a/drivers/i2c/exynos_hs_i2c.c +++ b/drivers/i2c/exynos_hs_i2c.c @@ -76,7 +76,6 @@ DECLARE_GLOBAL_DATA_PTR; HSI2C_TRANS_ABORT) #define HSI2C_TRANS_FINISHED_MASK (HSI2C_TRANS_ERROR_MASK | HSI2C_TRANS_SUCCESS) - /* I2C_FIFO_STAT Register bits */ #define HSI2C_RX_FIFO_EMPTY (1u << 24) #define HSI2C_RX_FIFO_FULL (1u << 23) diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c index 6eafbeeef4e..cc22c075ab1 100644 --- a/drivers/i2c/i2c-uniphier.c +++ b/drivers/i2c/i2c-uniphier.c @@ -198,7 +198,6 @@ static int uniphier_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) return 0; } - static const struct dm_i2c_ops uniphier_i2c_ops = { .xfer = uniphier_i2c_xfer, .set_bus_speed = uniphier_i2c_set_bus_speed, diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c index 6c0d8eb5f4f..a1be841b119 100644 --- a/drivers/i2c/imx_lpi2c.c +++ b/drivers/i2c/imx_lpi2c.c @@ -263,7 +263,6 @@ static int bus_i2c_write(struct udevice *bus, u32 chip, u8 *buf, int len) return result; } - u32 __weak imx_get_i2cclk(u32 i2c_num) { return 0; diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c index f212bd1f983..0a2800ebd7a 100644 --- a/drivers/i2c/muxes/i2c-mux-gpio.c +++ b/drivers/i2c/muxes/i2c-mux-gpio.c @@ -38,7 +38,6 @@ struct i2c_mux_gpio_priv { u32 idle; }; - static int i2c_mux_gpio_select(struct udevice *dev, struct udevice *bus, uint channel) { diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 0acdaf7e743..84c0050eac0 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -512,7 +512,6 @@ static int i2c_init_transfer(struct mxc_i2c_bus *i2c_bus, u8 chip, return ret; } - static int i2c_write_data(struct mxc_i2c_bus *i2c_bus, u8 chip, const u8 *buf, int len) { diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c index f0f9b2afacf..3bd5108fd23 100644 --- a/drivers/i2c/rcar_i2c.c +++ b/drivers/i2c/rcar_i2c.c @@ -54,7 +54,6 @@ #define RCAR_I2C_ICFBSCR 0x38 #define RCAR_I2C_ICFBSCR_TCYC17 0x0f /* 17*Tcyc */ - enum rcar_i2c_type { RCAR_I2C_TYPE_GEN2, RCAR_I2C_TYPE_GEN3, diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index 1f2afc65e8b..89ddf821063 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -96,7 +96,6 @@ DECLARE_GLOBAL_DATA_PTR; #define I2C_ACK 0 /* PD_SDA level to ack a byte */ #define I2C_NOACK 1 /* PD_SDA level to noack a byte */ - #ifdef DEBUG_I2C #define PRINTD(fmt,args...) do { \ printf (fmt ,##args); \ diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c index 0917ee20fed..dd1e1bc468e 100644 --- a/drivers/input/cros_ec_keyb.c +++ b/drivers/input/cros_ec_keyb.c @@ -28,7 +28,6 @@ struct cros_ec_keyb_priv { int ghost_filter; /* 1 to enable ghost filter, else 0 */ }; - /** * Check the keyboard controller and return a list of key matrix positions * for which a key is pressed diff --git a/drivers/led/led_lp5562.c b/drivers/led/led_lp5562.c index 0c5f9bc4300..a5776d3174f 100644 --- a/drivers/led/led_lp5562.c +++ b/drivers/led/led_lp5562.c @@ -122,7 +122,6 @@ static int lp5562_led_reg_update(struct udevice *dev, int regnum, else ret = dm_i2c_reg_clrset(dev, regnum, mask, value); - /* * Data sheet says "Delay between consecutive I2C writes to * ENABLE register (00h) need to be longer than 488 us @@ -521,7 +520,6 @@ U_BOOT_DRIVER(lp5562_led) = { .ops = &lp5562_led_ops, }; - static int lp5562_led_wrap_probe(struct udevice *dev) { struct lp5562_led_wrap_priv *priv = dev_get_priv(dev); diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c index 5516aa8b3ff..cbdc55054ba 100644 --- a/drivers/misc/cros_ec_i2c.c +++ b/drivers/misc/cros_ec_i2c.c @@ -99,7 +99,6 @@ static int cros_ec_i2c_packet(struct udevice *udev, int out_bytes, int in_bytes) return -EBADMSG; } - /* drop result and packet_len */ memmove(dev->din, &ec_response_i2c->ec_response, in_bytes); diff --git a/drivers/misc/stm32_rcc.c b/drivers/misc/stm32_rcc.c index 0dd827e1dd0..5a6f979f91b 100644 --- a/drivers/misc/stm32_rcc.c +++ b/drivers/misc/stm32_rcc.c @@ -76,7 +76,6 @@ static int stm32_rcc_bind(struct udevice *dev) dev_ofnode(dev), &child); } - static const struct udevice_id stm32_rcc_ids[] = { {.compatible = "st,stm32f42xx-rcc", .data = (ulong)&stm32_rcc_clk_f42x }, {.compatible = "st,stm32f469-rcc", .data = (ulong)&stm32_rcc_clk_f469 }, diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c index 87a6f66ebb3..b1752d2f881 100644 --- a/drivers/mmc/aspeed_sdhci.c +++ b/drivers/mmc/aspeed_sdhci.c @@ -93,7 +93,6 @@ U_BOOT_DRIVER(aspeed_sdhci_drv) = { .plat_auto = sizeof(struct aspeed_sdhci_plat), }; - static int aspeed_sdc_probe(struct udevice *parent) { struct clk clk; diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c index 5107fcd8362..e055026847f 100644 --- a/drivers/mmc/davinci_mmc.c +++ b/drivers/mmc/davinci_mmc.c @@ -473,7 +473,6 @@ int davinci_mmc_init(struct bd_info *bis, struct davinci_mmc *host) } #else - static int davinci_mmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index e6107c770fe..f4ecd7422ce 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -55,7 +55,6 @@ static void dwmci_prepare_data(struct dwmci_host *host, unsigned int i = 0, flags, cnt, blk_cnt; ulong data_start, data_end; - blk_cnt = data->blocks; dwmci_wait_reset(host, DWMCI_CTRL_FIFO_RESET); @@ -357,7 +356,6 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, return -EIO; } - if (cmd->resp_type & MMC_RSP_PRESENT) { if (cmd->resp_type & MMC_RSP_136) { cmd->response[0] = dwmci_readl(host, DWMCI_RESP3); diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 0c66980b621..683a7931c98 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -850,7 +850,6 @@ __weak int esdhc_status_fixup(void *blob, const char *compat) return 0; } - #if CONFIG_IS_ENABLED(DM_MMC) static int fsl_esdhc_get_cd(struct udevice *dev); static void esdhc_disable_for_no_card(void *blob) diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c index 1a11258be4d..3dd106bed4b 100644 --- a/drivers/mmc/fsl_esdhc_spl.c +++ b/drivers/mmc/fsl_esdhc_spl.c @@ -25,7 +25,6 @@ extern uchar mmc_u_boot_offs[]; #define MBRDBR_BOOT_SIG_55 0x1fe #define MBRDBR_BOOT_SIG_AA 0x1ff - void mmc_spl_load_image(uint32_t offs, unsigned int size, void *vdst) { uint blk_start, blk_cnt, err; diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index da6a39b7d99..83cdc9fd66d 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -538,7 +538,6 @@ U_BOOT_DRIVER(mmc_blk) = { }; #endif /* CONFIG_BLK */ - UCLASS_DRIVER(mmc) = { .id = UCLASS_MMC, .name = "mmc", diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index b18dc331f78..cf8277cbed8 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -785,7 +785,6 @@ static int mmc_complete_op_cond(struct mmc *mmc) return 0; } - int mmc_send_ext_csd(struct mmc *mmc, u8 *ext_csd) { struct mmc_cmd cmd; diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index 4ce0de6c47d..f5e9930c799 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -114,7 +114,6 @@ static int msm_sdc_mci_init(struct msm_sdhc *prv) writel(readl(prv->base + SDCC_MCI_POWER) | SDCC_MCI_POWER_SW_RST, prv->base + SDCC_MCI_POWER); - /* Wait for reset to be written to register */ if (wait_for_bit_le32(prv->base + SDCC_MCI_STATUS2, SDCC_MCI_STATUS2_MCI_ACT, false, 10, false)) { diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c index ebd72178b59..d676cf9e314 100644 --- a/drivers/mmc/mtk-sd.c +++ b/drivers/mmc/mtk-sd.c @@ -1631,7 +1631,6 @@ static void msdc_init_hw(struct msdc_host *host) clrsetbits_le32(&host->base->sdc_cfg, SDC_CFG_DTOC_M, 3 << SDC_CFG_DTOC_S); - host->def_tune_para.iocon = readl(&host->base->msdc_iocon); host->def_tune_para.pad_tune = readl(&host->base->pad_tune); } diff --git a/drivers/mmc/piton_mmc.c b/drivers/mmc/piton_mmc.c index fed1f841608..5ef2781eedf 100644 --- a/drivers/mmc/piton_mmc.c +++ b/drivers/mmc/piton_mmc.c @@ -22,7 +22,6 @@ #include <log.h> #include <mmc.h> - #define PITON_MMC_DUMMY_F_MAX 20000000 #define PITON_MMC_DUMMY_F_MIN 10000000 #define PITON_MMC_DUMMY_CAPACITY SZ_4G << 3 diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c index 0658ce22cf1..fa3ac2d9e37 100644 --- a/drivers/mmc/rpmb.c +++ b/drivers/mmc/rpmb.c @@ -60,7 +60,6 @@ static const char * const rpmb_err_msg[] = { "Authentication key not yet programmed", }; - /* Structure of RPMB data frame. */ struct s_rpmb { unsigned char stuff[RPMB_SZ_STUFF]; diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index 5ed7f01d3f3..355991beb0f 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -80,7 +80,6 @@ static void tegra_mmc_prepare_data(struct tegra_mmc_priv *priv, { unsigned char ctrl; - debug("buf: %p (%p), data->blocks: %u, data->blocksize: %u\n", bbstate->bounce_buffer, bbstate->user_buffer, data->blocks, data->blocksize); diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c index a832f348f22..54ec22d3088 100644 --- a/drivers/mtd/jedec_flash.c +++ b/drivers/mtd/jedec_flash.c @@ -85,13 +85,11 @@ enum uaddr { MTD_UADDR_UNNECESSARY, /* Does not require any address */ }; - struct unlock_addr { u32 addr1; u32 addr2; }; - /* * I don't like the fact that the first entry in unlock_addrs[] * exists, but is for MTD_UADDR_NOT_SUPPORTED - and, therefore, @@ -139,7 +137,6 @@ static const struct unlock_addr unlock_addrs[] = { } }; - struct amd_flash_info { const __u16 mfr_id; const __u16 dev_id; diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index aa78d41a55e..5bd64bd6ad4 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -172,7 +172,6 @@ bool mtd_dev_list_updated(void) #ifndef __UBOOT__ static LIST_HEAD(mtd_notifiers); - #define MTD_DEVT(index) MKDEV(MTD_CHAR_MAJOR, (index)*2) /* REVISIT once MTD uses the driver model better, whoever allocates @@ -747,7 +746,6 @@ out: } EXPORT_SYMBOL_GPL(get_mtd_device); - int __get_mtd_device(struct mtd_info *mtd) { int err; diff --git a/drivers/mtd/nand/raw/am335x_spl_bch.c b/drivers/mtd/nand/raw/am335x_spl_bch.c index 64d8ce0965a..4b50f351d35 100644 --- a/drivers/mtd/nand/raw/am335x_spl_bch.c +++ b/drivers/mtd/nand/raw/am335x_spl_bch.c @@ -25,7 +25,6 @@ static struct nand_chip nand_chip; CFG_SYS_NAND_ECCSIZE) #define ECCTOTAL (ECCSTEPS * CFG_SYS_NAND_ECCBYTES) - /* * NAND command for large page NAND devices (2k) */ @@ -87,7 +86,6 @@ static int nand_command(int block, int page, uint32_t offs, hwctrl(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE); - /* * Program and erase have their own busy handlers status, sequential * in and status need no delay. diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c index 4f013efafb3..10596ce8ee0 100644 --- a/drivers/mtd/nand/raw/arasan_nfc.c +++ b/drivers/mtd/nand/raw/arasan_nfc.c @@ -408,7 +408,6 @@ static int arasan_nand_read_page(struct mtd_info *mtd, u8 *buf, u32 size) for (i = 0; i < pktsize/4; i++) bufptr[i] = readl(&info->reg->buf_dataport); - bufptr += pktsize/4; if (rdcount >= pktnum) diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c index 857d50ef9b0..798036f6028 100644 --- a/drivers/mtd/nand/raw/fsl_ifc_nand.c +++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c @@ -1012,7 +1012,6 @@ static int fsl_ifc_chip_init(int devnum, u8 *addr) priv->bufnum_mask = 0; break; - default: printf("ifc nand: bad csor %#x: bad page size\n", csor); return -ENODEV; diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c index 11b0247b284..80d9307cdd1 100644 --- a/drivers/mtd/nand/raw/mxs_nand.c +++ b/drivers/mtd/nand/raw/mxs_nand.c @@ -277,7 +277,6 @@ static inline int mxs_nand_calc_ecc_for_large_oob(struct bch_geometry *geo, max_ecc = min(round_down(max_ecc, 2), nand_info->max_ecc_strength_supported); - /* search a supported ecc strength that makes bbm */ /* located in data chunk */ geo->ecc_strength = chip->ecc_strength_ds; diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c index a922a22b273..11dbcbbf442 100644 --- a/drivers/mtd/nand/raw/mxs_nand_dt.c +++ b/drivers/mtd/nand/raw/mxs_nand_dt.c @@ -90,7 +90,6 @@ static int mxs_nand_dt_probe(struct udevice *dev) info->gpmi_regs = devm_ioremap(dev, res.start, resource_size(&res)); - ret = dev_read_resource_byname(dev, "bch", &res); if (ret) return ret; diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 18b95caffef..4401bdcdb90 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -2767,7 +2767,6 @@ out: return ret; } - /** * nand_write_page_raw - [INTERN] raw page write function * @mtd: mtd info structure @@ -2927,7 +2926,6 @@ static int nand_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, return 0; } - /** * nand_write_subpage_hwecc - [REPLACEABLE] hardware ECC based subpage write * @mtd: mtd info structure @@ -2994,7 +2992,6 @@ static int nand_write_subpage_hwecc(struct mtd_info *mtd, return 0; } - /** * nand_write_page_syndrome - [REPLACEABLE] hardware ECC syndrome based page write * @mtd: mtd info structure diff --git a/drivers/mtd/nand/raw/nand_ecc.c b/drivers/mtd/nand/raw/nand_ecc.c index 0530ccb0722..969fd858075 100644 --- a/drivers/mtd/nand/raw/nand_ecc.c +++ b/drivers/mtd/nand/raw/nand_ecc.c @@ -22,7 +22,6 @@ * this file might be covered by the GNU General Public License. */ - #include <linux/errno.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand_ecc.h> diff --git a/drivers/mtd/nand/raw/nand_spl_simple.c b/drivers/mtd/nand/raw/nand_spl_simple.c index c0956ab0e49..a4f6c43c1a0 100644 --- a/drivers/mtd/nand/raw/nand_spl_simple.c +++ b/drivers/mtd/nand/raw/nand_spl_simple.c @@ -19,7 +19,6 @@ static struct nand_chip nand_chip; CFG_SYS_NAND_ECCSIZE) #define ECCTOTAL (ECCSTEPS * CFG_SYS_NAND_ECCBYTES) - #if (CONFIG_SYS_NAND_PAGE_SIZE <= 512) /* * NAND command for small page NAND devices (512) @@ -153,7 +152,6 @@ static int nand_read_page(int block, int page, uchar *dst) for (i = 0; i < ECCTOTAL; i++) ecc_code[i] = oob_data[nand_ecc_pos[i]]; - for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) { this->ecc.hwctl(mtd, NAND_ECC_READ); this->read_buf(mtd, p, eccsize); diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c index fda4239fa79..dd79bfdb5de 100644 --- a/drivers/mtd/nand/raw/nand_util.c +++ b/drivers/mtd/nand/raw/nand_util.c @@ -276,7 +276,6 @@ int nand_get_lock_status(struct mtd_info *mtd, loff_t offset) chipnr = (int)(offset >> chip->chip_shift); chip->select_chip(mtd, chipnr); - if ((offset & (mtd->writesize - 1)) != 0) { printf("nand_get_lock_status: " "Start address must be beginning of " diff --git a/drivers/mtd/nand/raw/omap_elm.c b/drivers/mtd/nand/raw/omap_elm.c index 61751b9ae2d..30049686ce1 100644 --- a/drivers/mtd/nand/raw/omap_elm.c +++ b/drivers/mtd/nand/raw/omap_elm.c @@ -134,7 +134,6 @@ int elm_check_error(u8 *syndrome, enum bch_level bch_type, u32 *error_count, return 0; } - /** * elm_config - Configure ELM module * @level: 4 / 8 / 16 bit BCH diff --git a/drivers/mtd/nand/raw/omap_elm.h b/drivers/mtd/nand/raw/omap_elm.h index f3db00d55de..65d07065111 100644 --- a/drivers/mtd/nand/raw/omap_elm.h +++ b/drivers/mtd/nand/raw/omap_elm.h @@ -34,7 +34,6 @@ enum bch_level { BCH_16_BIT }; - /* BCH syndrome registers */ struct syndrome { u32 syndrome_fragment_x[7]; /* 0x400, 0x404.... 0x418 */ diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c b/drivers/mtd/nand/raw/sunxi_nand_spl.c index 040138e2559..4f1e2d9a577 100644 --- a/drivers/mtd/nand/raw/sunxi_nand_spl.c +++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c @@ -47,7 +47,6 @@ #define NFC_CTL_PAGE_SIZE_MASK (0xf << 8) #define NFC_CTL_PAGE_SIZE(a) ((fls(a) - 11) << 8) - #define NFC_ECC_EN (1 << 0) #define NFC_ECC_PIPELINE (1 << 3) #define NFC_ECC_EXCEPTION (1 << 4) @@ -55,7 +54,6 @@ #define NFC_ECC_RANDOM_EN (1 << 9) #define NFC_ECC_RANDOM_DIRECTION (1 << 10) - #define NFC_ADDR_NUM_OFFSET 16 #define NFC_SEND_ADDR (1 << 19) #define NFC_ACCESS_DIR (1 << 20) diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c index 8285f87359e..ef43dcad079 100644 --- a/drivers/mtd/nand/raw/tegra_nand.c +++ b/drivers/mtd/nand/raw/tegra_nand.c @@ -679,7 +679,6 @@ static int nand_write_page_hwecc(struct mtd_info *mtd, return 0; } - /** * Read raw page data without ecc * diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c index 5f90171a6fe..ca1aff25a52 100644 --- a/drivers/mtd/nand/raw/zynq_nand.c +++ b/drivers/mtd/nand/raw/zynq_nand.c @@ -51,7 +51,6 @@ (0x5 << 0)) /* t_rc from nand_cycles */ #endif - #define ZYNQ_NAND_DIRECT_CMD ((0x4 << 23) | /* Chip 0 from interface 1 */ \ (0x2 << 21)) /* UpdateRegs operation */ diff --git a/drivers/mtd/nand/spi/paragon.c b/drivers/mtd/nand/spi/paragon.c index 0c123930f14..079431cea8f 100644 --- a/drivers/mtd/nand/spi/paragon.c +++ b/drivers/mtd/nand/spi/paragon.c @@ -11,10 +11,8 @@ #endif #include <linux/mtd/spinand.h> - #define SPINAND_MFR_PARAGON 0xa1 - #define PN26G0XA_STATUS_ECC_BITMASK (3 << 4) #define PN26G0XA_STATUS_ECC_NONE_DETECTED (0 << 4) @@ -22,7 +20,6 @@ #define PN26G0XA_STATUS_ECC_ERRORED (2 << 4) #define PN26G0XA_STATUS_ECC_8_CORRECTED (3 << 4) - static SPINAND_OP_VARIANTS(read_cache_variants, SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0), SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), @@ -39,7 +36,6 @@ static SPINAND_OP_VARIANTS(update_cache_variants, SPINAND_PROG_LOAD_X4(false, 0, NULL, 0), SPINAND_PROG_LOAD(false, 0, NULL, 0)); - static int pn26g0xa_ooblayout_ecc(struct mtd_info *mtd, int section, struct mtd_oob_region *region) { @@ -97,7 +93,6 @@ static const struct mtd_ooblayout_ops pn26g0xa_ooblayout = { .rfree = pn26g0xa_ooblayout_free, }; - static const struct spinand_info paragon_spinand_table[] = { SPINAND_INFO("PN26G01A", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xe1), diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index edecb841338..c8bc76794b5 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -503,7 +503,6 @@ static int onenand_wait(struct mtd_info *mtd, int state) return -EIO; } - return 0; } @@ -1278,7 +1277,6 @@ int onenand_bbt_read_oob(struct mtd_info *mtd, loff_t from, return ret; } - #ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE /** * onenand_verify_oob - [GENERIC] verify the oob contents after a write @@ -1720,7 +1718,6 @@ static int onenand_block_isbad_nolock(struct mtd_info *mtd, loff_t ofs, int allo return bbm->isbad_bbt(mtd, ofs, allowbbt); } - /** * onenand_erase - [MTD Interface] erase block(s) * @param mtd MTD device structure @@ -2128,7 +2125,6 @@ static void onenand_unlock_all(struct mtd_info *mtd) onenand_do_lock_cmd(mtd, ofs, len, ONENAND_CMD_UNLOCK); } - /** * onenand_check_features - Check and set OneNAND features * @param mtd MTD data structure diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c index 8dcffde9aa3..941f2040983 100644 --- a/drivers/mtd/renesas_rpc_hf.c +++ b/drivers/mtd/renesas_rpc_hf.c @@ -361,7 +361,6 @@ static int rpc_hf_probe(struct udevice *dev) if (addrc != 2 || sizec != 2) return -EINVAL; - ret = clk_get_by_index(dev, 0, &clk); if (ret < 0) { dev_err(dev, "Failed to get RPC clock\n"); diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index d3ef69ec74f..8d2249ce354 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -79,7 +79,6 @@ extern const struct flash_info spi_nor_ids[]; /* Get software write-protect value (BP bits) */ int spi_flash_cmd_get_sw_write_prot(struct spi_flash *flash); - #if CONFIG_IS_ENABLED(SPI_FLASH_MTD) int spi_flash_mtd_register(struct spi_flash *flash); void spi_flash_mtd_unregister(struct spi_flash *flash); diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index a1941b8eb88..cf0d702421f 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -1275,7 +1275,6 @@ int ubi_init(void) if (err) goto out_slab; - /* Attach MTD devices */ for (i = 0; i < mtd_devs; i++) { struct mtd_dev_param *p = &mtd_dev_param[i]; diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index b54b56375b4..21750e1817b 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -105,7 +105,6 @@ size_t ubi_calc_fm_size(struct ubi_device *ubi) return roundup(size, ubi->leb_size); } - /** * new_fm_vhdr - allocate a new volume header for fastmap usage. * @ubi: UBI device description object @@ -680,7 +679,6 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, goto fail_bad; } - if (fm->max_pool_size > UBI_FM_MAX_POOL_SIZE || fm->max_pool_size < 0) { ubi_err(ubi, "bad maximal pool size: %i", fm->max_pool_size); @@ -1241,7 +1239,6 @@ static int ubi_write_fastmap(struct ubi_device *ubi, } fmh->scrub_peb_count = cpu_to_be32(scrub_peb_count); - list_for_each_entry(ubi_wrk, &ubi->works, list) { if (ubi_is_erase_work(ubi_wrk)) { wl_e = ubi_wrk->e; diff --git a/drivers/net/bcm-sf2-eth-gmac.h b/drivers/net/bcm-sf2-eth-gmac.h index 477667f4eaa..ac5e45d4f90 100644 --- a/drivers/net/bcm-sf2-eth-gmac.h +++ b/drivers/net/bcm-sf2-eth-gmac.h @@ -18,7 +18,6 @@ #define GMAC0_INTR_RECV_LAZY_ADDR (GMAC0_REG_BASE + 0x100) #define GMAC0_PHY_CTRL_ADDR (GMAC0_REG_BASE + 0x188) - #define GMAC_DMA_PTR_OFFSET 0x04 #define GMAC_DMA_ADDR_LOW_OFFSET 0x08 #define GMAC_DMA_ADDR_HIGH_OFFSET 0x0c diff --git a/drivers/net/bnxt/bnxt.c b/drivers/net/bnxt/bnxt.c index 25fbcd7b116..96e804e8cac 100644 --- a/drivers/net/bnxt/bnxt.c +++ b/drivers/net/bnxt/bnxt.c @@ -3,7 +3,6 @@ * Copyright 2019-2021 Broadcom. */ - #include <asm/io.h> #include <dm.h> #include <linux/delay.h> diff --git a/drivers/net/designware.h b/drivers/net/designware.h index 918a38615ad..e47101ccaf6 100644 --- a/drivers/net/designware.h +++ b/drivers/net/designware.h @@ -64,7 +64,6 @@ struct eth_mac_regs { #define MII_REGMSK (0x1F << 6) #define MII_ADDRMSK (0x1F << 11) - struct eth_dma_regs { u32 busmode; /* 0x00 */ u32 txpolldemand; /* 0x04 */ diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index fcb205322c5..8f432b8637b 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -7,10 +7,8 @@ tested on both gig copper and gig fiber boards ***************************************************************************/ /******************************************************************************* - Copyright(c) 1999 - 2002 Intel Corporation. All rights reserved. - Contact Information: Linux NICS <linux.nics@intel.com> Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 @@ -1742,7 +1740,6 @@ e1000_initialize_hardware_bits(struct e1000_hw *hw) reg_txdctl1 |= E1000_TXDCTL_COUNT_DESC; E1000_WRITE_REG(hw, TXDCTL1, reg_txdctl1); - switch (hw->mac_type) { case e1000_igb: /* IGB is cool */ return; @@ -2594,7 +2591,6 @@ e1000_set_d0_lplu_state(struct e1000_hw *hw, bool active) return ret_val; } - } else { if (hw->mac_type == e1000_ich8lan) { @@ -5216,7 +5212,6 @@ e1000_configure_tx(struct e1000_hw *hw) E1000_WRITE_REG(hw, TARC1, tarc); } - e1000_config_collision_dist(hw); /* Setup Transmit Descriptor Settings for eop descriptor */ hw->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS; @@ -5227,7 +5222,6 @@ e1000_configure_tx(struct e1000_hw *hw) else hw->txd_cmd |= E1000_TXD_CMD_RS; - if (hw->mac_type == e1000_igb) { E1000_WRITE_REG(hw, TCTL_EXT, 0x42 << 10); diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h index aa649328f5f..5ca720f4609 100644 --- a/drivers/net/e1000.h +++ b/drivers/net/e1000.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /******************************************************************************* - Copyright(c) 1999 - 2002 Intel Corporation. All rights reserved. Copyright 2011 Freescale Semiconductor, Inc. @@ -402,7 +401,6 @@ struct e1000_phy_stats { off */ #define IFE_PSCL_PROBE_LEDS_ON 0x0007 /* Force LEDs 0 and 2 on */ - #define NUM_DEV_IDS 16 #define NODE_ADDRESS_SIZE 6 @@ -1069,7 +1067,6 @@ typedef enum { e1000_ffe_config_blocked } e1000_ffe_config; - /* Structure containing variables used by the shared code (e1000_hw.c) */ struct e1000_hw { const char *name; @@ -2128,7 +2125,6 @@ struct e1000_hw { /* In-Band Control Register (Page 194, Register 18) */ #define GG82563_ICR_DIS_PADDING 0x0010 /* Disable Padding Use */ - /* Bits... * 15-5: page * 4-0: register offset diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c index 44ce00041ee..f4e82b0507c 100644 --- a/drivers/net/fsl-mc/dpio/qbman_portal.c +++ b/drivers/net/fsl-mc/dpio/qbman_portal.c @@ -218,7 +218,6 @@ void qbman_eq_desc_set_response(struct qbman_eq_desc *d, qb_attr_code_encode(&code_eq_rsp_stash, cl, !!stash); } - void qbman_eq_desc_set_qd(struct qbman_eq_desc *d, uint32_t qdid, uint32_t qd_bin, uint32_t qd_prio) { @@ -365,7 +364,6 @@ static struct qb_attr_code code_dqrr_stat = QB_CODE(0, 8, 8); #define QBMAN_DQRR_RESPONSE_BPSCN 0x29 #define QBMAN_DQRR_RESPONSE_CSCN_WQ 0x2a - /* NULL return if there are no unconsumed DQRR entries. Returns a DQRR entry * only once, so repeated calls can return a sequence of DQRR entries, without * requiring they be consumed immediately or in any particular order. */ diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.h b/drivers/net/fsl-mc/dpio/qbman_portal.h index 8cbc771a127..67ed90cd389 100644 --- a/drivers/net/fsl-mc/dpio/qbman_portal.h +++ b/drivers/net/fsl-mc/dpio/qbman_portal.h @@ -16,7 +16,6 @@ #define QBMAN_VER_4_0_DQRR_SIZE 4 #define QBMAN_VER_4_1_DQRR_SIZE 8 - /* --------------------- */ /* portal data structure */ /* --------------------- */ @@ -130,7 +129,6 @@ static inline uint32_t qb_attr_code_decode(const struct qb_attr_code *code, return d32_uint32_t(code->lsoffset, code->width, cacheline[code->word]); } - /* encode a field to a cacheline */ static inline void qb_attr_code_encode(const struct qb_attr_code *code, uint32_t *cacheline, uint32_t val) diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 199a0723b84..fa0b3dbb6d1 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -101,7 +101,6 @@ static int _ftmac100_init(struct ftmac100_data *priv, unsigned char enetaddr[6]) /* set the ethernet address */ ftmac100_set_mac(priv, enetaddr); - /* disable all interrupts */ writel (0, &ftmac100->imr); diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c index d63e2dbfaeb..8cfeeffe95b 100644 --- a/drivers/net/gmac_rockchip.c +++ b/drivers/net/gmac_rockchip.c @@ -51,7 +51,6 @@ struct rk_gmac_ops { void (*set_to_rgmii)(struct gmac_rockchip_plat *pdata); }; - static int gmac_rockchip_of_to_plat(struct udevice *dev) { struct gmac_rockchip_plat *pdata = dev_get_plat(dev); diff --git a/drivers/net/ks8851_mll.h b/drivers/net/ks8851_mll.h index 7f90ae4e59b..7c5da7db5e2 100644 --- a/drivers/net/ks8851_mll.h +++ b/drivers/net/ks8851_mll.h @@ -114,7 +114,6 @@ #define TXSR_TXFID_SHIFT (0) #define TXSR_TXFID_GET(_v) (((_v) >> 0) & 0x3f) - #define KS_RXCR1 0x74 #define RXCR1_FRXQ (1 << 15) #define RXCR1_RXUDPFCC (1 << 14) diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.h b/drivers/net/ldpaa_eth/ldpaa_eth.h index af082e34cae..ac8d1e408ec 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.h +++ b/drivers/net/ldpaa_eth/ldpaa_eth.h @@ -17,7 +17,6 @@ #include <fsl-mc/fsl_qbman_portal.h> #include <fsl-mc/fsl_mc_private.h> - enum ldpaa_eth_type { LDPAA_ETH_1G_E, LDPAA_ETH_10G_E, diff --git a/drivers/net/ldpaa_eth/ldpaa_wriop.c b/drivers/net/ldpaa_eth/ldpaa_wriop.c index a803b8fa797..758759240e0 100644 --- a/drivers/net/ldpaa_eth/ldpaa_wriop.c +++ b/drivers/net/ldpaa_eth/ldpaa_wriop.c @@ -52,7 +52,6 @@ void wriop_init_dpmac_enet_if(int dpmac_id, phy_interface_t enet_if) } } - /*TODO what it do */ static int wriop_dpmac_to_index(int dpmac_id) { @@ -102,7 +101,6 @@ int wriop_is_enabled_dpmac(int dpmac_id) return dpmac_info[i].enabled; } - int wriop_set_mdio(int dpmac_id, struct mii_dev *bus) { int i = wriop_dpmac_to_index(dpmac_id); diff --git a/drivers/net/macb.h b/drivers/net/macb.h index 72b84ae96ed..0eb90574618 100644 --- a/drivers/net/macb.h +++ b/drivers/net/macb.h @@ -273,7 +273,6 @@ #define GEM_SGMIIEN_OFFSET 27 #define GEM_SGMIIEN_SIZE 1 - /* Constants for data bus width. */ #define GEM_DBW32 0 /* 32 bit AMBA AHB data bus width */ #define GEM_DBW64 1 /* 64 bit AMBA AHB data bus width */ @@ -303,7 +302,6 @@ #define GEM_ADDR64_OFFSET 30 /* Address bus width - 64b or 32b */ #define GEM_ADDR64_SIZE 1 - /* Bitfields in NSR */ #define MACB_NSR_LINK_OFFSET 0 /* pcs_link_state */ #define MACB_NSR_LINK_SIZE 1 @@ -456,7 +454,6 @@ #define GEM_TX_PKT_BUFF_OFFSET 21 #define GEM_TX_PKT_BUFF_SIZE 1 - /* Bitfields in DCFG5. */ #define GEM_TSU_OFFSET 8 #define GEM_TSU_SIZE 1 diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c index c44fa6acdd7..182f84c38af 100644 --- a/drivers/net/mpc8xx_fec.c +++ b/drivers/net/mpc8xx_fec.c @@ -636,7 +636,6 @@ static int fec_start(struct udevice *dev) return 0; } - static void fec_stop(struct udevice *dev) { struct ether_fcc_info_s *efis = dev_get_priv(dev); diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c index 2f3d0911fdf..1c584373b8b 100644 --- a/drivers/net/mscc_eswitch/luton_switch.c +++ b/drivers/net/mscc_eswitch/luton_switch.c @@ -627,7 +627,6 @@ static int luton_probe(struct udevice *dev) GCB_MISC_STAT_PHY_READY, true, 500, false)) return -EACCES; - /* Initialize miim buses */ memset(&miim, 0x0, sizeof(miim) * LUTON_MIIM_BUS_COUNT); diff --git a/drivers/net/mscc_eswitch/mscc_miim.h b/drivers/net/mscc_eswitch/mscc_miim.h index feb1f40ae55..b53fd304b1e 100644 --- a/drivers/net/mscc_eswitch/mscc_miim.h +++ b/drivers/net/mscc_eswitch/mscc_miim.h @@ -20,5 +20,4 @@ struct mii_dev *mscc_mdiobus_init(struct mscc_miim_dev *miim, int *miim_count, phys_addr_t miim_base, unsigned long miim_size); - #endif /* _MSCC_MIIM_H_ */ diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index f014d39b175..1640868c24a 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -970,7 +970,6 @@ static struct mvneta_rx_queue *mvneta_rxq_handle_get(struct mvneta_port *pp, return &pp->rxqs[rxq]; } - /* Drop packets received by the RXQ and free buffers */ static void mvneta_rxq_drop_pkts(struct mvneta_port *pp, struct mvneta_rx_queue *rxq) @@ -1107,7 +1106,6 @@ static void mvneta_cleanup_rxqs(struct mvneta_port *pp) mvneta_rxq_deinit(pp, &pp->rxqs[queue]); } - /* Init all Rx queues */ static int mvneta_setup_rxqs(struct mvneta_port *pp) { diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index d19a79d1600..ae545fe229c 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -4702,7 +4702,6 @@ static int mvpp2_port_init(struct udevice *dev, struct mvpp2_port *port) port->rxqs[queue] = rxq; } - /* Create Rx descriptor rings */ for (queue = 0; queue < rxq_number; queue++) { struct mvpp2_rx_queue *rxq = port->rxqs[queue]; diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c index ce2f76eabc8..651b8aee6f0 100644 --- a/drivers/net/pfe_eth/pfe_mdio.c +++ b/drivers/net/pfe_eth/pfe_mdio.c @@ -164,7 +164,6 @@ static void pfe_configure_serdes(struct pfe_eth_dev *priv) if (gem->phy_mode == PHY_INTERFACE_MODE_2500BASEX) sgmii_2500 = 1; - /* PCS configuration done with corresponding GEMAC */ bus.priv = gem_info[priv->gemac_port].gemac_base; diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c index 72d66812985..52c7189b904 100644 --- a/drivers/net/phy/davicom.c +++ b/drivers/net/phy/davicom.c @@ -21,7 +21,6 @@ #define MIIM_DM9161_10BTCSR 0x12 #define MIIM_DM9161_10BTCSR_INIT 0x7800 - /* Davicom DM9161E */ static int dm9161_config(struct phy_device *phydev) { diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c index a817c58b128..60020508896 100644 --- a/drivers/net/phy/lxt.c +++ b/drivers/net/phy/lxt.c @@ -15,7 +15,6 @@ #define MIIM_LXT971_SR2_100HDX 0x4000 /* 100 Mbit half duplex selected */ #define MIIM_LXT971_SR2_100FDX 0x4200 /* 100 Mbit full duplex selected */ - /* LXT971 */ static int lxt971_parse_status(struct phy_device *phydev) { diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c index 556d75e31ed..c48ae6e88f3 100644 --- a/drivers/net/phy/micrel_ksz90x1.c +++ b/drivers/net/phy/micrel_ksz90x1.c @@ -228,7 +228,6 @@ int ksz9021_phy_extended_read(struct phy_device *phydev, int regnum) return phy_read(phydev, MDIO_DEVAD_NONE, MII_KSZ9021_EXTENDED_DATAR); } - static int ksz9021_phy_extread(struct phy_device *phydev, int addr, int devaddr, int regnum) { diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c index 083d9d3996d..b143137893f 100644 --- a/drivers/net/phy/miiphybb.c +++ b/drivers/net/phy/miiphybb.c @@ -279,7 +279,6 @@ int bb_miiphy_read(struct mii_dev *miidev, int addr, int devad, int reg) return rdreg; } - /***************************************************************************** * * Write a MII PHY register. diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c index 6284298ebc1..db4c91e34b4 100644 --- a/drivers/net/phy/mv88e6352.c +++ b/drivers/net/phy/mv88e6352.c @@ -262,7 +262,6 @@ int do_mvsw_reg_write(const char *name, int argc, char *const argv[]) return ret; } - int do_mvsw_reg(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { int ret; diff --git a/drivers/net/phy/natsemi.c b/drivers/net/phy/natsemi.c index f7e514ef203..1a65e55402b 100644 --- a/drivers/net/phy/natsemi.c +++ b/drivers/net/phy/natsemi.c @@ -42,7 +42,6 @@ U_BOOT_PHY_DRIVER(dp83630) = { .shutdown = &genphy_shutdown, }; - /* DP83865 Link and Auto-Neg Status Register */ #define MIIM_DP83865_LANR 0x11 #define MIIM_DP83865_SPD_MASK 0x0018 @@ -50,7 +49,6 @@ U_BOOT_PHY_DRIVER(dp83630) = { #define MIIM_DP83865_SPD_100 0x0008 #define MIIM_DP83865_DPX_FULL 0x0002 - /* NatSemi DP83865 */ static int dp838xx_config(struct phy_device *phydev) { @@ -101,7 +99,6 @@ static int dp83865_startup(struct phy_device *phydev) return dp83865_parse_status(phydev); } - U_BOOT_PHY_DRIVER(dp83865) = { .name = "NatSemi DP83865", .uid = 0x20005c70, diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index e80aebc0bcf..edcae88a3fc 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -736,7 +736,6 @@ static void rtl8169_hw_start(struct udevice *dev) RTL_W32(TxConfig, (TX_DMA_BURST << TxDMAShift) | (InterFrameGap << TxInterFrameGapShift)); - tpc->cur_rx = 0; RTL_W32(TxDescStartAddrLow, dm_pci_mem_to_phys(dev, @@ -1031,7 +1030,6 @@ static int rtl_init(unsigned long dev_ioaddr, const char *name, #endif } - tpc->RxDescArray = rtl_alloc_descs(NUM_RX_DESC); if (!tpc->RxDescArray) return -ENOMEM; diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index 1c07610e1ac..ecf4a697e27 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h @@ -474,7 +474,6 @@ enum EESR_BIT { EESR_PRE = 0x00000002, EESR_CERF = 0x00000001, }; - #if defined(SH_ETH_TYPE_GETHER) || defined(SH_ETH_TYPE_RZ) # define TX_CHECK (EESR_TC1 | EESR_FTC) # define EESR_ERR_CHECK (EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE \ diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 6fab34715de..0da182d9f4c 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -171,7 +171,6 @@ struct emac_eth_dev { struct udevice *phy_reg; }; - struct sun8i_eth_pdata { struct eth_pdata eth_pdata; u32 reset_delays[3]; @@ -179,7 +178,6 @@ struct sun8i_eth_pdata { int rx_delay_ps; }; - static int sun8i_mdio_read(struct mii_dev *bus, int addr, int devad, int reg) { struct udevice *dev = bus->priv; diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c index 03a1a7a1159..d8085193e80 100644 --- a/drivers/net/ti/davinci_emac.c +++ b/drivers/net/ti/davinci_emac.c @@ -144,7 +144,6 @@ static int davinci_emac_write_hwaddr(struct udevice *dev) writel(mac_hi, &adap_emac->MACSRCADDRHI); writel(mac_lo, &adap_emac->MACSRCADDRLO); - return 0; } @@ -205,7 +204,6 @@ static int davinci_eth_phy_detect(void) return count; } - /* Read a PHY register via MDIO inteface. Returns 1 on success, 0 otherwise */ int davinci_eth_phy_read(u_int8_t phy_addr, u_int8_t reg_num, u_int16_t *data) { @@ -378,7 +376,6 @@ static int gen_auto_negotiate(int phy_addr) } /* End of generic PHY functions */ - #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) static int davinci_mii_phy_read(struct mii_dev *bus, int addr, int devad, int reg) diff --git a/drivers/net/ti/davinci_emac.h b/drivers/net/ti/davinci_emac.h index 695855b4d54..c213e24b8b2 100644 --- a/drivers/net/ti/davinci_emac.h +++ b/drivers/net/ti/davinci_emac.h @@ -20,7 +20,6 @@ */ #define EMAC_MAX_RX_BUFFERS 10 - /*********************************************** ******** Internally used macros *************** ***********************************************/ @@ -45,7 +44,6 @@ /* Number of statistics registers */ #define EMAC_NUM_STATS 36 - /* EMAC Descriptor */ typedef volatile struct _emac_desc { @@ -78,7 +76,6 @@ typedef volatile struct _emac_desc #define EMAC_RXMBPENABLE_RXCAFEN_ENABLE (0x200000) #define EMAC_RXMBPENABLE_RXBROADEN (0x2000) - #define MDIO_CONTROL_IDLE (0x80000000) #define MDIO_CONTROL_ENABLE (0x40000000) #define MDIO_CONTROL_FAULT_ENABLE (0x40000) diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index c6e5bf21cf0..d4abc9a0411 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -83,7 +83,6 @@ enum link_type { #endif - struct ks2_eth_priv { struct udevice *dev; struct phy_device *phydev; @@ -208,7 +207,6 @@ int keystone_sgmii_config(struct phy_device *phy_dev, int port, int interface) __raw_writel(mr_adv_ability, SGMII_MRADV_REG(port)); __raw_writel(control, SGMII_CTL_REG(port)); - mask = SGMII_REG_STATUS_LINK; if (control & SGMII_REG_CONTROL_AUTONEG) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index b41ee95892e..fe7d1084450 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -390,7 +390,6 @@ static int zynq_phy_init(struct udevice *dev) return phy_config(priv->phydev); } - static int zynq_gem_init(struct udevice *dev) { u32 i, nwconfig, nwcfg; diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c index cfa818ed821..141166e59b7 100644 --- a/drivers/pci/pci_auto_common.c +++ b/drivers/pci/pci_auto_common.c @@ -108,7 +108,6 @@ void pciauto_config_init(struct pci_controller *hose) } } - if (hose->pci_mem) pciauto_show_region("Memory", hose->pci_mem); if (hose->pci_prefetch) diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c index 1bad51fb3eb..ac7faa4cc19 100644 --- a/drivers/pci/pcie_dw_rockchip.c +++ b/drivers/pci/pcie_dw_rockchip.c @@ -506,7 +506,6 @@ static int rockchip_pcie_probe(struct udevice *dev) pcie_dw_get_link_width(&priv->dw), hose->first_busno); - ret = pcie_dw_prog_outbound_atu_unroll(&priv->dw, PCIE_ATU_REGION_INDEX0, PCIE_ATU_TYPE_MEM, diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c index 78a5d035865..dc6e65273b7 100644 --- a/drivers/pci/pcie_dw_ti.c +++ b/drivers/pci/pcie_dw_ti.c @@ -46,7 +46,6 @@ DECLARE_GLOBAL_DATA_PTR; #define PCIE_CMD_STATUS 0x04 #define LTSSM_EN_VAL BIT(0) - #define AM654_PCIE_DEV_TYPE_MASK 0x3 #define EP 0x0 #define LEG_EP 0x1 diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index ec4a7e7b657..97c38c0bfa7 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -503,7 +503,6 @@ static void fdt_fixup_pcie_ls(void *blob) struct extra_iommu_entry *entries; int i, cnt, nodeoffset; - /* Scan all known buses */ for (pci_find_first_device(&dev); dev; diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c index bca325d1996..2a1646cb2c0 100644 --- a/drivers/phy/marvell/comphy_a3700.c +++ b/drivers/phy/marvell/comphy_a3700.c @@ -389,7 +389,6 @@ static int comphy_usb3_power_up(u32 lane, u32 type, u32 speed, u32 invert) */ reg_set(USB3_CTRPUL_VAL_REG, 0x8 << 24, rb_usb3_ctr_100ns); - /* 0xd005c300 = 0x1001 */ /* set PRD_TXDEEMPH (3.5db de-emph) */ usb3_reg_set16(LANE_CFG0, 0x1, 0xFF, lane); diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.h b/drivers/pinctrl/exynos/pinctrl-exynos.h index 743bb557309..da666777581 100644 --- a/drivers/pinctrl/exynos/pinctrl-exynos.h +++ b/drivers/pinctrl/exynos/pinctrl-exynos.h @@ -92,7 +92,6 @@ struct exynos_pinctrl_config_data { const unsigned int value; }; - void exynos_pinctrl_setup_peri(struct exynos_pinctrl_config_data *conf, unsigned int num_conf, unsigned long base); int exynos_pinctrl_set_state(struct udevice *dev, diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c index 64036296e24..884ed258d17 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c @@ -729,7 +729,6 @@ static int armada_37xx_pinctrl_probe(struct udevice *dev) if (!info->funcs) return -ENOMEM; - ret = armada_37xx_fill_group(info); if (ret) return ret; diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c index 4996b69d9af..d87249ad1be 100644 --- a/drivers/pinctrl/pinctrl-sti.c +++ b/drivers/pinctrl/pinctrl-sti.c @@ -208,7 +208,6 @@ void sti_pin_configure(struct udevice *dev, struct sti_pin_desc *pin_desc) generic_clear_bit(bit, sysconfreg); } - static int sti_pinctrl_set_state(struct udevice *dev, struct udevice *config) { struct fdtdec_phandle_args args; diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c index 9f38b56e9c0..090351072d8 100644 --- a/drivers/pinctrl/pinctrl_pic32.c +++ b/drivers/pinctrl/pinctrl_pic32.c @@ -114,7 +114,6 @@ struct pic32_reg_in_mux { #define PPS_OUT(__port, __pin) \ (((__port) * PIC32_PINS_PER_PORT + (__pin)) << 2) - struct pic32_pinctrl_priv { struct pic32_reg_in_mux *mux_in; /* mux input function */ struct pic32_reg_port *pinconf; /* pin configuration*/ diff --git a/drivers/pinctrl/renesas/pfc-r8a77951.c b/drivers/pinctrl/renesas/pfc-r8a77951.c index 81568ae4a5e..1cfdc335041 100644 --- a/drivers/pinctrl/renesas/pfc-r8a77951.c +++ b/drivers/pinctrl/renesas/pfc-r8a77951.c @@ -250,7 +250,6 @@ #define GPSR7_1 FM(AVS2) #define GPSR7_0 FM(AVS1) - /* IPSRx */ /* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ /* 8 */ /* 9 */ /* A */ /* B */ /* C - F */ #define IP0_3_0 FM(AVB_MDC) F_(0, 0) FM(MSIOF2_SS2_C) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) #define IP0_7_4 FM(AVB_MAGIC) F_(0, 0) FM(MSIOF2_SS1_C) FM(SCK4_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) diff --git a/drivers/pinctrl/renesas/pfc-r8a7796.c b/drivers/pinctrl/renesas/pfc-r8a7796.c index 3de43febbd3..a289397fb8f 100644 --- a/drivers/pinctrl/renesas/pfc-r8a7796.c +++ b/drivers/pinctrl/renesas/pfc-r8a7796.c @@ -256,7 +256,6 @@ #define GPSR7_1 FM(AVS2) #define GPSR7_0 FM(AVS1) - /* IPSRx */ /* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ /* 8 */ /* 9 */ /* A */ /* B */ /* C - F */ #define IP0_3_0 FM(AVB_MDC) F_(0, 0) FM(MSIOF2_SS2_C) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) #define IP0_7_4 FM(AVB_MAGIC) F_(0, 0) FM(MSIOF2_SS1_C) FM(SCK4_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) diff --git a/drivers/pinctrl/renesas/pfc-r8a77965.c b/drivers/pinctrl/renesas/pfc-r8a77965.c index 3a6813cee61..2852ae64ec0 100644 --- a/drivers/pinctrl/renesas/pfc-r8a77965.c +++ b/drivers/pinctrl/renesas/pfc-r8a77965.c @@ -256,7 +256,6 @@ #define GPSR7_1 FM(AVS2) #define GPSR7_0 FM(AVS1) - /* IPSRx */ /* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ /* 8 */ /* 9 */ /* A */ /* B */ /* C - F */ #define IP0_3_0 FM(AVB_MDC) F_(0, 0) FM(MSIOF2_SS2_C) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) #define IP0_7_4 FM(AVB_MAGIC) F_(0, 0) FM(MSIOF2_SS1_C) FM(SCK4_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) diff --git a/drivers/pinctrl/renesas/pfc-r8a77970.c b/drivers/pinctrl/renesas/pfc-r8a77970.c index 3c9c060d245..00ebbbc7120 100644 --- a/drivers/pinctrl/renesas/pfc-r8a77970.c +++ b/drivers/pinctrl/renesas/pfc-r8a77970.c @@ -160,7 +160,6 @@ #define GPSR5_1 FM(QSPI0_MOSI_IO0) #define GPSR5_0 FM(QSPI0_SPCLK) - /* IPSRx */ /* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 - F */ #define IP0_3_0 FM(DU_DR2) FM(HSCK0) F_(0, 0) FM(A0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) #define IP0_7_4 FM(DU_DR3) FM(HRTS0_N) F_(0, 0) FM(A1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) diff --git a/drivers/pinctrl/renesas/pfc-r8a77980.c b/drivers/pinctrl/renesas/pfc-r8a77980.c index 14a4b4dc731..e3fc4045741 100644 --- a/drivers/pinctrl/renesas/pfc-r8a77980.c +++ b/drivers/pinctrl/renesas/pfc-r8a77980.c @@ -194,7 +194,6 @@ #define GPSR5_1 FM(QSPI0_MOSI_IO0) #define GPSR5_0 FM(QSPI0_SPCLK) - /* IPSRx */ /* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 - F */ #define IP0_3_0 FM(DU_DR2) FM(SCK4) FM(GETHER_RMII_CRS_DV) FM(A0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) #define IP0_7_4 FM(DU_DR3) FM(RX4) FM(GETHER_RMII_RX_ER) FM(A1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) diff --git a/drivers/pinctrl/renesas/pfc-r8a77995.c b/drivers/pinctrl/renesas/pfc-r8a77995.c index eccf5c15907..d3e2d842fa5 100644 --- a/drivers/pinctrl/renesas/pfc-r8a77995.c +++ b/drivers/pinctrl/renesas/pfc-r8a77995.c @@ -428,7 +428,6 @@ FM(IP12_31_28) IP12_31_28 \ #define MOD_SEL1_27 FM(SEL_SCIF0_0) FM(SEL_SCIF0_1) #define MOD_SEL1_26 FM(SEL_SSIF4_0) FM(SEL_SSIF4_1) - #define PINMUX_MOD_SELS \ \ MOD_SEL1_31 \ @@ -2870,7 +2869,6 @@ static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { { /* sentinel */ } }; - static int r8a77995_pin_to_pocctrl(unsigned int pin, u32 *pocctrl) { switch (pin) { diff --git a/drivers/pinctrl/renesas/pfc-r8a779f0.c b/drivers/pinctrl/renesas/pfc-r8a779f0.c index de5ec6c812a..eec50210d92 100644 --- a/drivers/pinctrl/renesas/pfc-r8a779f0.c +++ b/drivers/pinctrl/renesas/pfc-r8a779f0.c @@ -654,7 +654,6 @@ static const unsigned int i2c5_mux[] = { SDA5_MARK, SCL5_MARK, }; - /* - INTC-EX ---------------------------------------------------------------- */ static const unsigned int intc_ex_irq0_pins[] = { /* IRQ0 */ diff --git a/drivers/pinctrl/renesas/pfc-r8a779h0.c b/drivers/pinctrl/renesas/pfc-r8a779h0.c index 17422395ad1..2f09e767288 100644 --- a/drivers/pinctrl/renesas/pfc-r8a779h0.c +++ b/drivers/pinctrl/renesas/pfc-r8a779h0.c @@ -261,7 +261,6 @@ #define GPSR7_1 F_(AVB0_AVTP_CAPTURE, IP0SR7_7_4) #define GPSR7_0 F_(AVB0_AVTP_PPS, IP0SR7_3_0) - /* SR0 */ /* IP0SR0 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ #define IP0SR0_3_0 F_(0, 0) FM(ERROROUTC_N_B) FM(TCLK2_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c index 96a47daac35..2f6c3b3d1c7 100644 --- a/drivers/pinctrl/renesas/pfc.c +++ b/drivers/pinctrl/renesas/pfc.c @@ -947,7 +947,6 @@ static int sh_pfc_map_pins(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx) return 0; } - static int sh_pfc_pinctrl_probe(struct udevice *dev) { struct sh_pfc_pinctrl_priv *priv = dev_get_priv(dev); diff --git a/drivers/pinctrl/tegra/funcmux-tegra20.c b/drivers/pinctrl/tegra/funcmux-tegra20.c index b8c91323785..951ae196161 100644 --- a/drivers/pinctrl/tegra/funcmux-tegra20.c +++ b/drivers/pinctrl/tegra/funcmux-tegra20.c @@ -32,7 +32,6 @@ static const struct pmux_pingrp_config disp1_default[] = { PINMUX(SLXD, SPDIF, NORMAL, NORMAL), }; - int funcmux_select(enum periph_id id, int config) { int bad_config = config != FUNCMUX_DEFAULT; diff --git a/drivers/power/regulator/lp873x_regulator.c b/drivers/power/regulator/lp873x_regulator.c index c59d77118ad..271a7e45139 100644 --- a/drivers/power/regulator/lp873x_regulator.c +++ b/drivers/power/regulator/lp873x_regulator.c @@ -310,7 +310,6 @@ static int buck_get_enable(struct udevice *dev) bool enable = false; int ret; - ret = lp873x_buck_enable(dev, PMIC_OP_GET, &enable); if (ret) return ret; diff --git a/drivers/power/regulator/lp87565_regulator.c b/drivers/power/regulator/lp87565_regulator.c index d622d956815..2212cb5c651 100644 --- a/drivers/power/regulator/lp87565_regulator.c +++ b/drivers/power/regulator/lp87565_regulator.c @@ -167,7 +167,6 @@ static int buck_get_enable(struct udevice *dev) bool enable = false; int ret; - ret = lp87565_buck_enable(dev, PMIC_OP_GET, &enable); if (ret) return ret; diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c index 39c05f9b7d3..0cf2e50d65c 100644 --- a/drivers/power/twl6030.c +++ b/drivers/power/twl6030.c @@ -29,7 +29,6 @@ static struct twl6030_data twl6032_info = { .vbat_shift = TWL6032_VBAT_SHIFT, }; - static int twl6030_gpadc_read_channel(u8 channel_no) { u8 lsb = 0; diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c index 42114a5aa91..ab087275fe2 100644 --- a/drivers/ram/rockchip/dmc-rk3368.c +++ b/drivers/ram/rockchip/dmc-rk3368.c @@ -138,7 +138,6 @@ enum { #define DDR3_MR2_TWL(n) \ (((n - 5) & 0x7) << 3) - #ifdef CONFIG_TPL_BUILD static void ddr_set_noc_spr_err_stall(struct rk3368_grf *grf, bool enable) @@ -524,7 +523,6 @@ static int pctl_calc_timings(struct rk3368_sdram_params *params, pctl_timing->tckesr = pctl_timing->tcke + 1; /* JESD-79: tCKE + 1tCK */ pctl_timing->tdpd = 0; /* RK3368 TRM: "allowed values for DDR3: 0" */ - /* * The controller can represent tFAW as 4x, 5x or 6x tRRD only. * We want to use the smallest multiplier that satisfies the tFAW @@ -987,7 +985,6 @@ static struct ram_ops rk3368_dmc_ops = { .get_info = rk3368_dmc_get_info, }; - static const struct udevice_id rk3368_dmc_ids[] = { { .compatible = "rockchip,rk3368-dmc" }, { } diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c index 10dc05dd640..954995c499c 100644 --- a/drivers/ram/stm32_sdram.c +++ b/drivers/ram/stm32_sdram.c @@ -333,7 +333,6 @@ static int stm32_fmc_of_to_plat(struct udevice *dev) return -EINVAL; } - params->bank_params[bank].sdram_timing = (struct stm32_sdram_timing *) ofnode_read_u8_array_ptr(bank_node, @@ -346,7 +345,6 @@ static int stm32_fmc_of_to_plat(struct udevice *dev) return -EINVAL; } - bank_params->sdram_ref_count = ofnode_read_u32_default(bank_node, "st,sdram-refcount", 8196); bank++; diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c index d7834b32299..0e37ea93fbc 100644 --- a/drivers/ram/stm32mp1/stm32mp1_ddr.c +++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c @@ -707,7 +707,6 @@ void stm32mp1_ddr_init(struct ddr_info *priv, break; } - if (config->c_reg.mstr & DDRCTRL_MSTR_DDR3) ret = board_ddr_power_init(STM32MP_DDR3); else if (config->c_reg.mstr & DDRCTRL_MSTR_LPDDR2) { diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c index 3ba2b40dca3..e64354dd52f 100644 --- a/drivers/remoteproc/rproc-uclass.c +++ b/drivers/remoteproc/rproc-uclass.c @@ -518,7 +518,6 @@ int rproc_is_running(int id) return _rproc_ops_wrapper(id, RPROC_RUNNING); }; - static int handle_trace(struct udevice *dev, struct fw_rsc_trace *rsc, int offset, int avail) { diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c index ef2c1872249..d78b3fa1bbd 100644 --- a/drivers/remoteproc/ti_k3_r5f_rproc.c +++ b/drivers/remoteproc/ti_k3_r5f_rproc.c @@ -42,7 +42,6 @@ #define PROC_BOOT_CFG_FLAG_R5_MEM_INIT_DIS 0x00004000 #define PROC_BOOT_CFG_FLAG_R5_SINGLE_CORE 0x00008000 - /* R5 TI-SCI Processor Control Flags */ #define PROC_BOOT_CTRL_FLAG_R5_CORE_HALT 0x00000001 diff --git a/drivers/reset/reset-ast2500.c b/drivers/reset/reset-ast2500.c index 0ed5396b3e9..f3543fa8cc1 100644 --- a/drivers/reset/reset-ast2500.c +++ b/drivers/reset/reset-ast2500.c @@ -63,8 +63,6 @@ static int ast2500_reset_status(struct reset_ctl *reset_ctl) return !!status; } - - static int ast2500_reset_probe(struct udevice *dev) { int rc; diff --git a/drivers/rtc/ds1307.c b/drivers/rtc/ds1307.c index ba06ff9f0be..04921099101 100644 --- a/drivers/rtc/ds1307.c +++ b/drivers/rtc/ds1307.c @@ -139,7 +139,6 @@ read_rtc: } #endif - tmp->tm_sec = bcd2bin (sec & 0x7F); tmp->tm_min = bcd2bin (min & 0x7F); tmp->tm_hour = bcd2bin (hour & 0x3F); @@ -157,7 +156,6 @@ read_rtc: return rel; } - /* * Set the RTC */ @@ -190,7 +188,6 @@ int rtc_set (struct rtc_time *tmp) return 0; } - /* * Reset the RTC. We setting the date back to 1970-01-01. * We also enable the oscillator output on the SQW/OUT pin and program @@ -204,7 +201,6 @@ void rtc_reset (void) rtc_write (RTC_CTL_REG_ADDR, RTC_CTL_BIT_SQWE | RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS0); } - /* * Helper functions */ @@ -215,7 +211,6 @@ uchar rtc_read (uchar reg) return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg)); } - static void rtc_write (uchar reg, uchar val) { i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val); diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c index 7eccf1cb8c5..77544298d8a 100644 --- a/drivers/rtc/ds1337.c +++ b/drivers/rtc/ds1337.c @@ -62,7 +62,6 @@ #define RTC_STAT_BIT_A2F 0x2 /* Alarm 2 flag */ #define RTC_STAT_BIT_OSF 0x80 /* Oscillator stop flag */ - #if !CONFIG_IS_ENABLED(DM_RTC) static uchar rtc_read (uchar reg); static void rtc_write (uchar reg, uchar val); @@ -119,7 +118,6 @@ int rtc_get (struct rtc_time *tmp) return rel; } - /* * Set the RTC */ @@ -145,7 +143,6 @@ int rtc_set (struct rtc_time *tmp) return 0; } - /* * Reset the RTC. We also enable the oscillator output on the * SQW/INTB* pin and program it for 32,768 Hz output. Note that @@ -176,7 +173,6 @@ void rtc_reset (void) #endif } - /* * Helper functions */ @@ -187,7 +183,6 @@ uchar rtc_read (uchar reg) return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg)); } - static void rtc_write (uchar reg, uchar val) { i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val); diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c index d6267d660d0..6341a1d62b8 100644 --- a/drivers/rtc/ds3231.c +++ b/drivers/rtc/ds3231.c @@ -34,7 +34,6 @@ #define RTC_CTL_REG_ADDR 0x0e #define RTC_STAT_REG_ADDR 0x0f - /* * RTC control register bits */ @@ -54,12 +53,10 @@ #define RTC_STAT_BIT_BB32KHZ 0x40 /* Battery backed 32KHz Output */ #define RTC_STAT_BIT_EN32KHZ 0x8 /* Enable 32KHz Output */ - #if !CONFIG_IS_ENABLED(DM_RTC) static uchar rtc_read (uchar reg); static void rtc_write (uchar reg, uchar val); - /* * Get the current time from the RTC */ @@ -107,7 +104,6 @@ int rtc_get (struct rtc_time *tmp) return rel; } - /* * Set the RTC */ @@ -133,7 +129,6 @@ int rtc_set (struct rtc_time *tmp) return 0; } - /* * Reset the RTC. We also enable the oscillator output on the * SQW/INTB* pin and program it for 32,768 Hz output. Note that @@ -167,7 +162,6 @@ uchar rtc_read (uchar reg) return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg)); } - static void rtc_write (uchar reg, uchar val) { i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val); diff --git a/drivers/rtc/mcfrtc.c b/drivers/rtc/mcfrtc.c index b5cc6b96881..9708971c5c4 100644 --- a/drivers/rtc/mcfrtc.c +++ b/drivers/rtc/mcfrtc.c @@ -4,7 +4,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ - #include <command.h> #include <rtc.h> #include <asm/immap.h> diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c index a82acec6f7e..8c80fe9cb79 100644 --- a/drivers/rtc/rv3029.c +++ b/drivers/rtc/rv3029.c @@ -73,7 +73,6 @@ RV3029_TRICKLE_80K) #define RV3029_TRICKLE_SHIFT 4 - static int rv3029_rtc_get(struct udevice *dev, struct rtc_time *tm) { u8 regs[RTC_RV3029_PAGE_LEN]; @@ -127,7 +126,6 @@ static int rv3029_rtc_set(struct udevice *dev, const struct rtc_time *tm) __func__, tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday, tm->tm_hour, tm->tm_min, tm->tm_sec); - if (tm->tm_year < 2000) { printf("%s: year %d (before 2000) not supported\n", __func__, tm->tm_year); diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 73cb83548eb..51cacf34792 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -345,7 +345,6 @@ static int scsi_read_capacity(struct udevice *dev, struct scsi_cmd *pccb, return 0; } - /* * Some setup (fill-in) routines */ diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c index c0930cf7334..a7e566bd23f 100644 --- a/drivers/serial/serial_arc.c +++ b/drivers/serial/serial_arc.c @@ -24,7 +24,6 @@ struct arc_serial_regs { unsigned int baudh; }; - struct arc_serial_plat { struct arc_serial_regs *reg; unsigned int uartclk; diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c index ff66e69b9d7..24ecb236d51 100644 --- a/drivers/serial/serial_linflexuart.c +++ b/drivers/serial/serial_linflexuart.c @@ -69,7 +69,6 @@ static int _linflex_serial_putc(struct linflex_fsl *base, const char c) { __raw_writeb(c, &base->bdrl); - if (!(__raw_readb(&base->uartsr) & UARTSR_DTF)) return -EAGAIN; @@ -197,7 +196,6 @@ U_BOOT_DRIVER(serial_linflex) = { #include <debug_uart.h> - static inline void _debug_uart_init(void) { struct linflex_fsl *base = (struct linflex_fsl *)CONFIG_VAL(DEBUG_UART_BASE); diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index a06e6dc2505..93602797b83 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -101,7 +101,6 @@ static void lpuart_write32(u32 flags, u32 *addr, u32 val) } } - u32 __weak get_lpuart_clk(void) { return get_board_sys_clk(); diff --git a/drivers/serial/serial_nulldev.c b/drivers/serial/serial_nulldev.c index 78a9e0b195f..e2c6dec5e32 100644 --- a/drivers/serial/serial_nulldev.c +++ b/drivers/serial/serial_nulldev.c @@ -31,7 +31,6 @@ static const struct udevice_id nulldev_serial_ids[] = { { } }; - const struct dm_serial_ops nulldev_serial_ops = { .putc = nulldev_serial_putc, .pending = nulldev_serial_pending, diff --git a/drivers/serial/serial_pl01x_internal.h b/drivers/serial/serial_pl01x_internal.h index 71c52bb5312..7ae3ae50908 100644 --- a/drivers/serial/serial_pl01x_internal.h +++ b/drivers/serial/serial_pl01x_internal.h @@ -92,7 +92,6 @@ struct pl01x_priv { #define UART_PL010_LCRH_PEN (1 << 1) #define UART_PL010_LCRH_BRK (1 << 0) - #define UART_PL010_BAUD_460800 1 #define UART_PL010_BAUD_230400 3 #define UART_PL010_BAUD_115200 7 diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index ae3ac8070d3..b7d77fbb6a9 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -54,7 +54,6 @@ static circbuf_t usbtty_input; static circbuf_t usbtty_output; - /* * Instance variables */ @@ -77,7 +76,6 @@ int usbtty_configured_flag = 0; */ static char serial_number[16]; - /* * Descriptors, Strings, Local variables. */ @@ -257,12 +255,10 @@ static struct rs232_emu rs232_desc={ .data_bits = 0x08 }; - /* * Static Generic Serial specific data */ - struct gserial_config_desc { struct usb_configuration_descriptor configuration_desc; @@ -575,28 +571,24 @@ static void usbtty_init_strings (void) str2wide (CONFIG_USBD_MANUFACTURER, string->wData); usbtty_string_table[STR_MANUFACTURER]=string; - string = (struct usb_string_descriptor *) wstrProduct; string->bLength = sizeof(wstrProduct); string->bDescriptorType = USB_DT_STRING; str2wide (CONFIG_USBD_PRODUCT_NAME, string->wData); usbtty_string_table[STR_PRODUCT]=string; - string = (struct usb_string_descriptor *) wstrSerial; string->bLength = sizeof(serial_number); string->bDescriptorType = USB_DT_STRING; str2wide (serial_number, string->wData); usbtty_string_table[STR_SERIAL]=string; - string = (struct usb_string_descriptor *) wstrConfiguration; string->bLength = sizeof(wstrConfiguration); string->bDescriptorType = USB_DT_STRING; str2wide (CFG_USBD_CONFIGURATION_STR, string->wData); usbtty_string_table[STR_CONFIG]=string; - string = (struct usb_string_descriptor *) wstrDataInterface; string->bLength = sizeof(wstrDataInterface); string->bDescriptorType = USB_DT_STRING; diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c index d3f3d4761c2..b2643a30d3d 100644 --- a/drivers/soc/ti/k3-navss-ringacc.c +++ b/drivers/soc/ti/k3-navss-ringacc.c @@ -80,7 +80,6 @@ struct k3_nav_ring_rt_regs { #define K3_DMARING_RING_RT_DB_ENTRY_MASK GENMASK(7, 0) #define K3_DMARING_RING_RT_DB_TDOWN_ACK BIT(31) - /** * struct k3_nav_ring_fifo_regs - The Ring Accelerator Queues Registers region */ diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c index 6b3091aa5de..42947357836 100644 --- a/drivers/sound/wm8994.c +++ b/drivers/sound/wm8994.c @@ -579,7 +579,6 @@ static int wm8994_init_volume_aif2_dac1(struct wm8994_priv *priv) ret = wm8994_bic_or(priv, WM8994_AIF2_DAC_FILTERS_1, WM8994_AIF2DAC_MUTE_MASK, 0); - ret |= wm8994_bic_or(priv, WM8994_AIF2_DAC_LEFT_VOLUME, WM8994_AIF2DAC_VU_MASK | WM8994_AIF2DACL_VOL_MASK, WM8994_AIF2DAC_VU | 0xff); @@ -588,7 +587,6 @@ static int wm8994_init_volume_aif2_dac1(struct wm8994_priv *priv) WM8994_AIF2DAC_VU_MASK | WM8994_AIF2DACR_VOL_MASK, WM8994_AIF2DAC_VU | 0xff); - ret |= wm8994_bic_or(priv, WM8994_DAC1_LEFT_VOLUME, WM8994_DAC1_VU_MASK | WM8994_DAC1L_VOL_MASK | WM8994_DAC1L_MUTE_MASK, WM8994_DAC1_VU | 0xc0); diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index 929bf90458c..2178534baf0 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -186,7 +186,6 @@ static int __nspi_espi_rx(struct nds_spi_slave *ns, void *din, unsigned int byte return bytes; } - static int __atcspi200_spi_xfer(struct nds_spi_slave *ns, unsigned int bitlen, const void *data_out, void *data_in, unsigned long flags) diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c index faefac71260..fb2d77d7d4a 100644 --- a/drivers/spi/ath79_spi.c +++ b/drivers/spi/ath79_spi.c @@ -133,7 +133,6 @@ static int ath79_spi_xfer(struct udevice *dev, unsigned int bitlen, return 0; } - static int ath79_spi_set_speed(struct udevice *bus, uint speed) { struct ath79_spi_priv *priv = dev_get_priv(bus); diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index 04c134be9ed..82049872d05 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -207,7 +207,6 @@ static int davinci_spi_read_write(struct davinci_spi_slave *ds, unsigned return 0; } - static int __davinci_spi_claim_bus(struct davinci_spi_slave *ds, int cs) { unsigned int mode = 0, scalar; diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index ff61a14f095..e7c393ae188 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -622,7 +622,6 @@ static int mxc_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct mxc_spi_slave *mxcs = dev_get_plat(dev->parent); - return mxc_spi_xfer_internal(mxcs, bitlen, dout, din, flags); } diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c index d91d58da459..12320367e97 100644 --- a/drivers/spi/spi-aspeed-smc.c +++ b/drivers/spi/spi-aspeed-smc.c @@ -960,7 +960,6 @@ static int aspeed_spi_ctrl_init(struct udevice *bus) return 0; } - ret = aspeed_spi_read_fixed_decoded_ranges(bus); if (ret != 0) return ret; diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index ebcb5b6cc88..d15d91a1d24 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -53,7 +53,6 @@ struct zynq_spi_regs { u32 rxdr; /* 0x20 */ }; - /* zynq spi platform data */ struct zynq_spi_plat { struct zynq_spi_regs *regs; diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c index 0abb4042e0f..d30b008bf9a 100644 --- a/drivers/sysreset/sysreset-uclass.c +++ b/drivers/sysreset/sysreset-uclass.c @@ -117,7 +117,6 @@ void reset_cpu(void) sysreset_walk_halt(SYSRESET_WARM); } - #if IS_ENABLED(CONFIG_SYSRESET_CMD_RESET) int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { diff --git a/drivers/thermal/thermal-uclass.c b/drivers/thermal/thermal-uclass.c index f0fe912e313..c61e6c3ee0e 100644 --- a/drivers/thermal/thermal-uclass.c +++ b/drivers/thermal/thermal-uclass.c @@ -13,7 +13,6 @@ #include <asm/io.h> #include <linux/list.h> - int thermal_get_temp(struct udevice *dev, int *temp) { const struct dm_thermal_ops *ops = device_get_ops(dev); diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c index 413bcc32f01..6ad520c10aa 100644 --- a/drivers/timer/arc_timer.c +++ b/drivers/timer/arc_timer.c @@ -89,7 +89,6 @@ static int arc_timer_probe(struct udevice *dev) return 0; } - static const struct timer_ops arc_timer_ops = { .get_count = arc_timer_get_count, }; diff --git a/drivers/timer/sp804_timer.c b/drivers/timer/sp804_timer.c index a254e295cbf..3e57f4b98ba 100644 --- a/drivers/timer/sp804_timer.c +++ b/drivers/timer/sp804_timer.c @@ -29,7 +29,6 @@ DECLARE_GLOBAL_DATA_PTR; #define SP804_CTRL_TIMER_32BIT (1U << 1) #define SP804_CTRL_ONESHOT (1U << 0) - struct sp804_timer_plat { uintptr_t base; }; diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c index b0fe97ab1d0..d35a4dd3a36 100644 --- a/drivers/tpm/tpm2_tis_spi.c +++ b/drivers/tpm/tpm2_tis_spi.c @@ -175,7 +175,6 @@ static int tpm_tis_spi_read32(struct udevice *dev, u32 addr, u32 *result) return ret; } - static int tpm_tis_spi_write(struct udevice *dev, u32 addr, u16 len, const u8 *out) { return tpm_tis_spi_xfer(dev, addr, out, NULL, len); diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c index dec7acb0c7b..e53af25a456 100644 --- a/drivers/tpm/tpm_tis_lpc.c +++ b/drivers/tpm/tpm_tis_lpc.c @@ -453,7 +453,6 @@ static int tpm_tis_lpc_get_desc(struct udevice *dev, char *buf, int size) chip_name[chip_type]); } - static const struct tpm_ops tpm_tis_lpc_ops = { .open = tpm_tis_lpc_open, .close = tpm_tis_lpc_close, diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index 731ede2fead..a9ba315463c 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -131,7 +131,6 @@ static int dwc3_generic_probe(struct udevice *dev, priv->base = map_physmem(plat->base, DWC3_OTG_REGS_END, MAP_NOCACHE); dwc3->regs = priv->base + DWC3_GLOBALS_REGS_START; - rc = dwc3_init(dwc3); if (rc) { unmap_physmem(priv->base, MAP_NOCACHE); diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 8f08fda746d..fe33e307d3e 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -754,7 +754,6 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep, dep->name, req, (unsigned long long)dma, length, last ? " last" : "", chain ? " chain" : ""); - trb = &dep->trb_pool[dep->free_slot & DWC3_TRB_MASK]; if (!req->trb) { diff --git a/drivers/usb/dwc3/samsung_usb_phy.c b/drivers/usb/dwc3/samsung_usb_phy.c index 0a771308163..3563070cb85 100644 --- a/drivers/usb/dwc3/samsung_usb_phy.c +++ b/drivers/usb/dwc3/samsung_usb_phy.c @@ -26,7 +26,6 @@ void exynos5_usb3_phy_init(struct exynos_usb3_phy *phy) PHYPARAM0_REF_LOSLEVEL_MASK); setbits_le32(&phy->phy_param0, PHYPARAM0_REF_LOSLEVEL); - writel(0x0, &phy->phy_resume); /* diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c index c5a01ec922b..40a6e9291de 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -96,7 +96,6 @@ #define FLAG_TYPE_AX88772B (1U << 2) #define FLAG_EEPROM_MAC (1U << 3) /* initial mac address in eeprom */ - /* driver private */ struct asix_private { int flags; diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c index a0aa5c25e42..4bd3b9d10dc 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -392,7 +392,6 @@ static int asix_init_common(struct ueth_data *dev, u8 buf[2], tmp[5], link_sts; u16 *tmp16, mode; - tmp16 = (u16 *)buf; debug("** %s()\n", __func__); diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c index 1363ef9e73d..e41b1d964ea 100644 --- a/drivers/usb/gadget/config.c +++ b/drivers/usb/gadget/config.c @@ -16,7 +16,6 @@ #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> - /** * usb_descriptor_fillbuf - fill buffer with descriptors * @buf: Buffer to be filled @@ -51,7 +50,6 @@ usb_descriptor_fillbuf(void *buf, unsigned buflen, return dest - (u8 *)buf; } - /** * usb_gadget_config_buf - builts a complete configuration descriptor * @config: Header for the descriptor, including characteristics such diff --git a/drivers/usb/gadget/core.c b/drivers/usb/gadget/core.c index 888f0cfea66..bcb1ad3082c 100644 --- a/drivers/usb/gadget/core.c +++ b/drivers/usb/gadget/core.c @@ -22,7 +22,6 @@ #define MAX_INTERFACES 2 - int maxstrings = 20; /* Global variables ************************************************************************** */ @@ -65,10 +64,8 @@ __maybe_unused static char *usbd_device_status[] = { #define USBD_DEVICE_STATUS(x) (((unsigned int)x <= USBD_CLOSING) ? usbd_device_status[x] : "UNKNOWN") - /* Descriptor support functions ************************************************************** */ - /** * usbd_get_string - find and return a string descriptor * @index: string index to return @@ -83,10 +80,8 @@ struct usb_string_descriptor *usbd_get_string (__u8 index) return usb_strings[index]; } - /* Access to device descriptor functions ***************************************************** */ - /* * * usbd_device_configuration_instance - find a configuration instance for this device * @device: @@ -103,7 +98,6 @@ static struct usb_configuration_instance *usbd_device_configuration_instance (st return device->configuration_instance_array + configuration; } - /* * * usbd_device_interface_instance * @device: @@ -149,7 +143,6 @@ struct usb_alternate_instance *usbd_device_alternate_instance (struct usb_device return interface_instance->alternates_instance_array + alternate; } - /* * * usbd_device_device_descriptor * @device: which device @@ -182,7 +175,6 @@ struct usb_configuration_descriptor *usbd_device_configuration_descriptor (struc return (configuration_instance->configuration_descriptor); } - /** * usbd_device_interface_descriptor * @device: which device @@ -231,7 +223,6 @@ struct usb_endpoint_descriptor *usbd_device_endpoint_descriptor_index (struct us return *(alternate_instance->endpoints_descriptor_array + index); } - /** * usbd_device_endpoint_transfersize * @device: which device @@ -255,7 +246,6 @@ int usbd_device_endpoint_transfersize (struct usb_device_instance *device, int p return *(alternate_instance->endpoint_transfersize_array + index); } - /** * usbd_device_endpoint_descriptor * @device: which device @@ -292,7 +282,6 @@ int usbd_endpoint_halted (struct usb_device_instance *device, int endpoint) return (device->status == USB_STATUS_HALT); } - /** * usbd_rcv_complete - complete a receive * @endpoint: @@ -460,7 +449,6 @@ struct urb *first_urb_detached (urb_link * hd) return urb; } - /* * Append an urb_link (or a whole list of * urb_links) to the tail of another list diff --git a/drivers/usb/gadget/dwc2_udc_otg_regs.h b/drivers/usb/gadget/dwc2_udc_otg_regs.h index 9ca6f423757..01056fab1c2 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_regs.h +++ b/drivers/usb/gadget/dwc2_udc_otg_regs.h @@ -204,7 +204,6 @@ struct dwc2_usbotg_reg { #define DIEPCTL0_NEXT_EP_BIT (11) - /* DWC2_UDC_OTG_DIEPMSK/DOEPMSK device IN/OUT endpoint common interrupt mask register */ /* DWC2_UDC_OTG_DIEPINTn/DOEPINTn device IN/OUT endpoint interrupt register */ diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c index 16b2a03f9e4..c0408bae076 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c @@ -92,7 +92,6 @@ static inline void dwc2_ep0_complete_out(void) } - static int setdma_rx(struct dwc2_ep *ep, struct dwc2_request *req) { u32 *buf, ctrl; @@ -972,7 +971,6 @@ static void dwc2_udc_set_nak(struct dwc2_ep *ep) return; } - static void dwc2_udc_ep_set_stall(struct dwc2_ep *ep) { u8 ep_num; @@ -1440,7 +1438,6 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev) } } - if (likely(dev->driver)) { /* device-2-host (IN) or no data setup command, * process immediately */ @@ -1462,7 +1459,6 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev) " bRequest = %d\n", i, usb_ctrl->bRequest); - } else if (dev->req_pending) { dev->req_pending = 0; debug_cond(DEBUG_SETUP != 0, diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c index 9d08640ff23..8c7fc17c2ea 100644 --- a/drivers/usb/gadget/ep0.c +++ b/drivers/usb/gadget/ep0.c @@ -93,7 +93,6 @@ __maybe_unused static char *usbd_device_requests[] = { /* EP0 Configuration Set ********************************************************************* */ - /** * ep0_get_status - fill in URB data with appropriate status * @device: @@ -376,7 +375,6 @@ static int ep0_get_descriptor (struct usb_device_instance *device, return -1; } - dbg_ep0 (1, "urb: buffer: %p buffer_length: %2d actual_length: %2d tx_packetSize: %2d", urb->buffer, urb->buffer_length, urb->actual_length, device->bus->endpoint_array[0].tx_packetSize); @@ -421,7 +419,6 @@ int ep0_recv_setup (struct urb *urb) dbg_ep0 (3, "urb: %p device: %p", urb, urb->device); - /*dbg_ep0(2, "- - - - - - - - - -"); */ dbg_ep0 (2, @@ -533,7 +530,6 @@ int ep0_recv_setup (struct urb *urb) /* handle the requests that do not return data */ else { - /*dbg_ep0(3, "Host-to-Device"); */ switch (request->bRequest) { diff --git a/drivers/usb/gadget/ep0.h b/drivers/usb/gadget/ep0.h index 976825ab93e..a16d36be938 100644 --- a/drivers/usb/gadget/ep0.h +++ b/drivers/usb/gadget/ep0.h @@ -18,8 +18,6 @@ #ifndef __USBDCORE_EP0_H__ #define __USBDCORE_EP0_H__ - int ep0_recv_setup (struct urb *urb); - #endif diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c index a4da4f72de9..495460473e9 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -24,7 +24,6 @@ static unsigned epnum; static unsigned in_epnum; #endif - /* * This should work with endpoints from controller drivers sharing the * same endpoint naming convention. By example: diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index b7b7bacb00d..7973927e8a7 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -35,7 +35,6 @@ extern struct platform_data brd; - unsigned packet_received, packet_sent; /* @@ -273,7 +272,6 @@ static char dev_addr[18]; static char host_addr[18]; - /*-------------------------------------------------------------------------*/ /* @@ -806,7 +804,6 @@ static const struct usb_descriptor_header *hs_rndis_function[] = { }; #endif - /* maxpacket and other transfer characteristics vary by speed. */ static inline struct usb_endpoint_descriptor * ep_desc(struct usb_gadget *g, struct usb_endpoint_descriptor *hs, @@ -2137,7 +2134,6 @@ autoconf_fail: #endif } - /* network device setup */ dev->net = l_priv->netdev; diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 89a96dbb7a7..ffe1ae6eb73 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -387,7 +387,6 @@ struct fsg_dev { struct usb_ep *bulk_out; }; - static inline int __fsg_is_set(struct fsg_common *common, const char *func, unsigned line) { @@ -404,13 +403,11 @@ static inline int __fsg_is_set(struct fsg_common *common, #define fsg_is_set(common) likely(__fsg_is_set(common, __func__, __LINE__)) - static inline struct fsg_dev *fsg_from_func(struct usb_function *f) { return container_of(f, struct fsg_dev, function); } - typedef void (*fsg_routine_t)(struct fsg_dev *); static int exception_in_progress(struct fsg_common *common) @@ -1118,7 +1115,6 @@ static int do_inquiry(struct fsg_common *common, struct fsg_buffhd *bh) return 36; } - static int do_request_sense(struct fsg_common *common, struct fsg_buffhd *bh) { struct fsg_lun *curlun = &common->luns[common->lun]; @@ -1210,7 +1206,6 @@ static int do_read_header(struct fsg_common *common, struct fsg_buffhd *bh) return 8; } - static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh) { struct fsg_lun *curlun = &common->luns[common->lun]; @@ -1319,7 +1314,6 @@ static int do_mode_sense(struct fsg_common *common, struct fsg_buffhd *bh) return len; } - static int do_start_stop(struct fsg_common *common) { struct fsg_lun *curlun = &common->luns[common->lun]; @@ -1358,7 +1352,6 @@ static int do_prevent_allow(struct fsg_common *common) return 0; } - static int do_read_format_capacities(struct fsg_common *common, struct fsg_buffhd *bh) { @@ -1376,7 +1369,6 @@ static int do_read_format_capacities(struct fsg_common *common, return 12; } - static int do_mode_select(struct fsg_common *common, struct fsg_buffhd *bh) { struct fsg_lun *curlun = &common->luns[common->lun]; @@ -1387,7 +1379,6 @@ static int do_mode_select(struct fsg_common *common, struct fsg_buffhd *bh) return -EINVAL; } - /*-------------------------------------------------------------------------*/ static int halt_bulk_in_endpoint(struct fsg_dev *fsg) @@ -1512,7 +1503,6 @@ static int throw_away_data(struct fsg_common *common) return 0; } - static int finish_reply(struct fsg_common *common) { struct fsg_buffhd *bh = common->next_buffhd_to_fill; @@ -1608,7 +1598,6 @@ static int finish_reply(struct fsg_common *common) return rc; } - static int send_status(struct fsg_common *common) { struct fsg_lun *curlun = &common->luns[common->lun]; @@ -1664,7 +1653,6 @@ static int send_status(struct fsg_common *common) return 0; } - /*-------------------------------------------------------------------------*/ /* Check whether the command is properly formed and whether its data size @@ -1792,7 +1780,6 @@ static int check_command_size_in_blocks(struct fsg_common *common, mask, needs_medium, name); } - static int do_scsi_command(struct fsg_common *common) { struct fsg_buffhd *bh; @@ -2127,7 +2114,6 @@ static int received_cbw(struct fsg_dev *fsg, struct fsg_buffhd *bh) return 0; } - static int get_next_command(struct fsg_common *common) { struct fsg_buffhd *bh; @@ -2166,7 +2152,6 @@ static int get_next_command(struct fsg_common *common) return rc; } - /*-------------------------------------------------------------------------*/ static int enable_endpoint(struct fsg_common *common, struct usb_ep *ep, @@ -2279,10 +2264,8 @@ reset: return rc; } - /****************************** ALT CONFIGS ******************************/ - static int fsg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) { struct fsg_dev *fsg = fsg_from_func(f); @@ -2603,7 +2586,6 @@ static void fsg_common_release(struct kref *ref) kfree(common); } - /*-------------------------------------------------------------------------*/ /** @@ -2722,7 +2704,6 @@ autoconf_fail: return -ENOTSUPP; } - /****************************** ADD FUNCTION ******************************/ static struct usb_gadget_strings *fsg_strings_array[] = { diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index 89496917a61..514c097591b 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -588,7 +588,6 @@ static struct usb_request *alloc_ep_req(struct usb_ep *ep, unsigned length) return req; } - static struct usb_request *sdp_start_ep(struct usb_ep *ep, bool in) { struct usb_request *req; diff --git a/drivers/usb/gadget/ndis.h b/drivers/usb/gadget/ndis.h index 753838f7941..371d37ff05a 100644 --- a/drivers/usb/gadget/ndis.h +++ b/drivers/usb/gadget/ndis.h @@ -21,7 +21,6 @@ #ifndef _USBGADGET_NDIS_H #define _USBGADGET_NDIS_H - #define NDIS_STATUS_MULTICAST_FULL 0xC0010009 #define NDIS_STATUS_MULTICAST_EXISTS 0xC001000A #define NDIS_STATUS_MULTICAST_NOT_FOUND 0xC001000B @@ -60,7 +59,6 @@ struct NDIS_PM_PACKET_PATTERN { __le32 PatternFlags; }; - /* Required Object IDs (OIDs) */ #define OID_GEN_SUPPORTED_LIST 0x00010101 #define OID_GEN_HARDWARE_STATUS 0x00010102 diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c index 5e6e5a054ca..76801bff9a3 100644 --- a/drivers/usb/gadget/rndis.c +++ b/drivers/usb/gadget/rndis.c @@ -53,7 +53,6 @@ static const __le32 rndis_driver_version = __constant_cpu_to_le32(1); /* Function Prototypes */ static rndis_resp_t *rndis_add_response(int configNr, u32 length); - /* supported OIDs */ static const u32 oid_supported_list[] = { /* the general stuff */ @@ -138,7 +137,6 @@ static const u32 oid_supported_list[] = { #endif /* RNDIS_PM */ }; - /* NDIS Functions */ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf, unsigned buf_len, rndis_resp_t *r) @@ -942,7 +940,6 @@ static int rndis_keepalive_response(int configNr, return 0; } - /* * Device to Host Comunication */ diff --git a/drivers/usb/gadget/rndis.h b/drivers/usb/gadget/rndis.h index 77db55a563f..84b6aeffb08 100644 --- a/drivers/usb/gadget/rndis.h +++ b/drivers/usb/gadget/rndis.h @@ -72,7 +72,6 @@ #define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xFD010104 #define OID_PNP_ENABLE_WAKE_UP 0xFD010106 - typedef struct rndis_init_msg_type { __le32 MessageType; __le32 MessageLength; diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c index 97dc6b6f729..7e4b542f7ce 100644 --- a/drivers/usb/gadget/storage_common.c +++ b/drivers/usb/gadget/storage_common.c @@ -13,7 +13,6 @@ * Łukasz Majewski <l.majewski@samsung.com> */ - /* * This file requires the following identifiers used in USB strings to * be defined (each of type pointer to char): @@ -46,10 +45,8 @@ * characters rather then a pointer to void. */ - /* #include <asm/unaligned.h> */ - /* * Thanks to NetChip Technologies for donating this product ID. * diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c index fb912654097..44912de7787 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -21,7 +21,6 @@ #define MX5_USBOTHER_REGS_OFFSET 0x800 - #define MXC_OTG_OFFSET 0 #define MXC_H1_OFFSET 0x200 #define MXC_H2_OFFSET 0x400 diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index 87ef19074b0..c21deb53ce2 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h @@ -71,7 +71,6 @@ struct ed { } __attribute__((aligned(ED_ALIGNMENT))); typedef struct ed ed_t; - /* TD info field */ #define TD_CC 0xf0000000 #define TD_CC_GET(td_p) ((td_p >>28) & 0x0f) @@ -107,7 +106,6 @@ typedef struct ed ed_t; #define TD_BUFFERUNDERRUN 0x0D #define TD_NOTACCESSED 0x0F - #define MAXPSW 1 struct td { @@ -232,7 +230,6 @@ struct ohci_regs { #define OHCI_INTR_OC (1 << 30) /* ownership change */ #define OHCI_INTR_MIE (1 << 31) /* master interrupt enable */ - /* Virtual Root HUB */ struct virt_root_hub { int devnum; /* Address of Root Hub endpoint */ @@ -268,7 +265,6 @@ struct virt_root_hub { /* Our Vendor Specific Request */ #define RH_SET_EP 0x2000 - /* Hub port features */ #define RH_PORT_CONNECTION 0x00 #define RH_PORT_ENABLE 0x01 @@ -295,7 +291,6 @@ struct virt_root_hub { #define RH_REQ_ERR -1 #define RH_NACK 0x00 - /* OHCI ROOT HUB REGISTER MASKS */ /* roothub.portstatus [i] bits */ @@ -372,7 +367,6 @@ typedef struct ohci_device { * a subset of what the full implementation needs. (Linus) */ - typedef struct ohci { /* this allocates EDs for all possible endpoints */ struct ohci_device ohci_dev __aligned(TD_ALIGNMENT); diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 045b0fba812..df94a66aa0a 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -56,7 +56,6 @@ void xhci_inval_cache(uintptr_t addr, u32 len) ALIGN(addr + len, CACHELINE_SIZE)); } - /** * frees the "segment" pointer passed * diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c index 257e7685cfa..cb01a8a3b38 100644 --- a/drivers/usb/musb-new/musb_core.c +++ b/drivers/usb/musb-new/musb_core.c @@ -98,7 +98,6 @@ #define TA_WAIT_BCON(m) max_t(int, (m)->a_wait_bcon, OTG_TIME_A_WAIT_BCON) - #define DRIVER_AUTHOR "Mentor Graphics, Texas Instruments, Nokia" #define DRIVER_DESC "Inventra Dual-Role USB Controller Driver" @@ -114,7 +113,6 @@ MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:" MUSB_DRIVER_NAME); - #ifndef __UBOOT__ /*-------------------------------------------------------------------------*/ @@ -301,7 +299,6 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst) #endif /* normal PIO */ - /*-------------------------------------------------------------------------*/ /* for high speed test mode; see USB 2.0 spec 7.1.20 */ @@ -971,7 +968,6 @@ int musb_start(struct musb *musb) #endif } - static void musb_generic_disable(struct musb *musb) { void __iomem *mbase = musb->mregs; @@ -1042,7 +1038,6 @@ static void musb_shutdown(struct platform_device *pdev) } #endif - /*-------------------------------------------------------------------------*/ /* @@ -1344,7 +1339,6 @@ done: return 0; } - /* * ep_config_from_hw - when MUSB_C_DYNFIFO_DEF is false * @param musb the controller diff --git a/drivers/usb/musb-new/musb_core.h b/drivers/usb/musb-new/musb_core.h index adfd81b8544..0e9ec96c0e8 100644 --- a/drivers/usb/musb-new/musb_core.h +++ b/drivers/usb/musb-new/musb_core.h @@ -143,7 +143,6 @@ enum musb_g_ep0_state { #define OTG_TIME_A_AIDL_BDIS 200 /* min 200 msec */ #define OTG_TIME_B_ASE0_BRST 100 /* min 3.125 ms */ - /*************************** REGISTER ACCESS ********************************/ /* Endpoint registers (other than dynfifo setup) can be accessed either diff --git a/drivers/usb/musb-new/musb_dma.h b/drivers/usb/musb-new/musb_dma.h index 5f99356ca79..9cafcf4432d 100644 --- a/drivers/usb/musb-new/musb_dma.h +++ b/drivers/usb/musb-new/musb_dma.h @@ -141,7 +141,6 @@ struct dma_controller { /* called after channel_program(), may indicate a fault */ extern void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit); - extern struct dma_controller *__init dma_controller_create(struct musb *, void __iomem *); diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c index 29e225aa0f1..08fac829ce7 100644 --- a/drivers/usb/musb-new/musb_gadget.c +++ b/drivers/usb/musb-new/musb_gadget.c @@ -32,7 +32,6 @@ #include "musb_core.h" - /* MUSB PERIPHERAL status 3-mar-2006: * * - EP0 seems solid. It passes both USBCV and usbtest control cases. @@ -274,7 +273,6 @@ static inline int max_ep_writesize(struct musb *musb, struct musb_ep *ep) return ep->packet_sz; } - #ifdef CONFIG_USB_INVENTRA_DMA /* Peripheral tx (IN) using Mentor DMA works as follows: @@ -1823,7 +1821,6 @@ static void musb_gadget_release(struct device *dev) } #endif - static void __devinit init_peripheral_ep(struct musb *musb, struct musb_ep *ep, u8 epnum, int is_in) { @@ -2285,7 +2282,6 @@ __acquires(musb->lock) else if (devctl & MUSB_DEVCTL_HR) musb_writeb(mbase, MUSB_DEVCTL, MUSB_DEVCTL_SESSION); - /* what speed did we negotiate? */ power = musb_readb(mbase, MUSB_POWER); musb->g.speed = (power & MUSB_POWER_HSMODE) diff --git a/drivers/usb/musb-new/musb_gadget.h b/drivers/usb/musb-new/musb_gadget.h index 7cb7a5cd6dc..b11e7205299 100644 --- a/drivers/usb/musb-new/musb_gadget.h +++ b/drivers/usb/musb-new/musb_gadget.h @@ -43,7 +43,6 @@ extern struct usb_request * musb_alloc_request(struct usb_ep *ep, gfp_t gfp_flags); extern void musb_free_request(struct usb_ep *ep, struct usb_request *req); - /* * struct musb_ep - peripheral side view of endpoint rx or tx side */ diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c index 63eee31a6b3..ea65326ab62 100644 --- a/drivers/usb/musb-new/musb_gadget_ep0.c +++ b/drivers/usb/musb-new/musb_gadget_ep0.c @@ -501,7 +501,6 @@ static void ep0_rxstate(struct musb *musb) } else csr = MUSB_CSR0_P_SVDRXPKTRDY | MUSB_CSR0_P_SENDSTALL; - /* Completion handler may choose to stall, e.g. because the * message just received holds invalid data. */ @@ -895,7 +894,6 @@ finish: return retval; } - static int musb_g_ep0_enable(struct usb_ep *ep, const struct usb_endpoint_descriptor *desc) { diff --git a/drivers/usb/musb-new/musb_host.c b/drivers/usb/musb-new/musb_host.c index 2f2fc7c1359..7528a53d73e 100644 --- a/drivers/usb/musb-new/musb_host.c +++ b/drivers/usb/musb-new/musb_host.c @@ -32,7 +32,6 @@ #include "musb_core.h" #include "musb_host.h" - /* MUSB HOST status 22-mar-2006 * * - There's still lots of partial code duplication for fault paths, so @@ -67,7 +66,6 @@ * although ARP RX wins. (That test was done with a full speed link.) */ - /* * NOTE on endpoint usage: * @@ -82,7 +80,6 @@ * of transfers between endpoints, or anything clever. */ - static void musb_ep_program(struct musb *musb, u8 epnum, struct urb *urb, int is_out, u8 *buf, u32 offset, u32 len); @@ -884,7 +881,6 @@ static void musb_ep_program(struct musb *musb, u8 epnum, } } - /* * Service the default endpoint (ep0) as host. * Return true until it's time to start the status stage. @@ -1085,7 +1081,6 @@ done: return retval; } - #ifdef CONFIG_USB_INVENTRA_DMA /* Host side TX (OUT) using Mentor DMA works as follows: @@ -1344,7 +1339,6 @@ void musb_host_tx(struct musb *musb, u8 epnum) MUSB_TXCSR_H_WZC_BITS | MUSB_TXCSR_TXPKTRDY); } - #ifdef CONFIG_USB_INVENTRA_DMA /* Host side RX (IN) using Mentor DMA works as follows: diff --git a/drivers/usb/musb-new/musb_host.h b/drivers/usb/musb-new/musb_host.h index 5a604bdb0cf..823e327ef0e 100644 --- a/drivers/usb/musb-new/musb_host.h +++ b/drivers/usb/musb-new/musb_host.h @@ -59,7 +59,6 @@ static inline struct musb_qh *first_qh(struct list_head *q) return list_entry(q->next, struct musb_qh, ring); } - extern void musb_root_disconnect(struct musb *musb); struct usb_hcd; diff --git a/drivers/usb/musb-new/musb_io.h b/drivers/usb/musb-new/musb_io.h index 19b12f36a5c..0ced19919ef 100644 --- a/drivers/usb/musb-new/musb_io.h +++ b/drivers/usb/musb-new/musb_io.h @@ -24,14 +24,12 @@ static inline u16 musb_readw(const void __iomem *addr, unsigned offset) static inline u32 musb_readl(const void __iomem *addr, unsigned offset) { return __raw_readl(addr + offset); } - static inline void musb_writew(void __iomem *addr, unsigned offset, u16 data) { __raw_writew(data, addr + offset); } static inline void musb_writel(void __iomem *addr, unsigned offset, u32 data) { __raw_writel(data, addr + offset); } - #if defined(CONFIG_USB_MUSB_TUSB6010) || defined (CONFIG_USB_MUSB_TUSB6010_MODULE) /* diff --git a/drivers/usb/musb-new/musb_regs.h b/drivers/usb/musb-new/musb_regs.h index 9fd01fafdf7..a54da45d490 100644 --- a/drivers/usb/musb-new/musb_regs.h +++ b/drivers/usb/musb-new/musb_regs.h @@ -188,7 +188,6 @@ /* HUBADDR */ #define MUSB_HUBADDR_MULTI_TT 0x80 - /* SUNXI has different reg addresses, but identical r/w functions */ #ifndef CONFIG_ARCH_SUNXI diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c index 080bd78523c..f9747d69bf6 100644 --- a/drivers/usb/musb/omap3.c +++ b/drivers/usb/musb/omap3.c @@ -63,7 +63,6 @@ static struct omap3_otg_regs *otg; #define OMAP3_OTG_FORCESTDBY_STANDBY 0x0001 - #ifdef DEBUG_MUSB_OMAP3 static void musb_db_otg_regs(void) { diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c index 9ec5b2d172b..ce9a7b5b819 100644 --- a/drivers/usb/phy/rockchip_usb2_phy.c +++ b/drivers/usb/phy/rockchip_usb2_phy.c @@ -72,7 +72,6 @@ static void property_enable(struct dwc2_plat_otg_data *pdata, writel(val, pdata->regs_phy + reg->offset); } - void otg_phy_init(struct dwc2_udc *dev) { struct dwc2_plat_otg_data *pdata = dev->pdata; diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c index a26154ab588..03b37fd8a9e 100644 --- a/drivers/video/broadwell_igd.c +++ b/drivers/video/broadwell_igd.c @@ -319,7 +319,6 @@ err: return ret; }; - static unsigned long gtt_read(struct broadwell_igd_priv *priv, unsigned long reg) { diff --git a/drivers/video/console_rotate.c b/drivers/video/console_rotate.c index dc969836274..a3f8c6352f8 100644 --- a/drivers/video/console_rotate.c +++ b/drivers/video/console_rotate.c @@ -100,7 +100,6 @@ static int console_putc_xy_1(struct udevice *dev, uint x_frac, uint y, int cp) return VID_TO_POS(fontdata->width); } - static int console_set_row_2(struct udevice *dev, uint row, int clr) { struct video_priv *vid_priv = dev_get_uclass_priv(dev->parent); diff --git a/drivers/video/dw_hdmi.c b/drivers/video/dw_hdmi.c index 35559cef229..1bf65fbd89e 100644 --- a/drivers/video/dw_hdmi.c +++ b/drivers/video/dw_hdmi.c @@ -762,7 +762,6 @@ static void hdmi_audio_set_format(struct dw_hdmi *hdmi) hdmi_write(hdmi, HDMI_AUD_CONF0_I2S_SELECT | HDMI_AUD_CONF0_I2S_IN_EN_0, HDMI_AUD_CONF0); - hdmi_write(hdmi, HDMI_AUD_CONF1_I2S_MODE_STANDARD_MODE | HDMI_AUD_CONF1_I2S_WIDTH_16BIT, HDMI_AUD_CONF1); diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c index b0afb2338fb..d17cea396fe 100644 --- a/drivers/video/exynos/exynos_dp.c +++ b/drivers/video/exynos/exynos_dp.c @@ -1064,7 +1064,6 @@ int exynos_dp_enable(struct udevice *dev, int panel_bpp, return ret; } - static const struct dm_display_ops exynos_dp_ops = { .enable = exynos_dp_enable, }; diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c index f007b319b20..552524d838d 100644 --- a/drivers/video/exynos/exynos_dp_lowlevel.c +++ b/drivers/video/exynos/exynos_dp_lowlevel.c @@ -65,7 +65,6 @@ void exynos_dp_enable_video_mute(struct exynos_dp *dp_regs, unsigned int enable) return; } - static void exynos_dp_init_analog_param(struct exynos_dp *dp_regs) { unsigned int reg; diff --git a/drivers/video/imx/ipu.h b/drivers/video/imx/ipu.h index 1e02c7ab6d5..4c13c9342f7 100644 --- a/drivers/video/imx/ipu.h +++ b/drivers/video/imx/ipu.h @@ -143,7 +143,6 @@ enum ipu_dmfc_type { DMFC_HIGH_RESOLUTION_ONLY_DP, }; - /* * Union of initialization parameters for a logical channel. */ diff --git a/drivers/video/imx/ipu_common.c b/drivers/video/imx/ipu_common.c index d582fb8ad9d..bd1ef0a800d 100644 --- a/drivers/video/imx/ipu_common.c +++ b/drivers/video/imx/ipu_common.c @@ -204,7 +204,6 @@ static void clk_ipu_disable(struct clk *clk) #endif } - static struct clk ipu_clk = { .name = "ipu_clk", #if defined(CONFIG_MX51) || defined(CONFIG_MX53) @@ -272,7 +271,6 @@ static inline int ipu_is_dmfc_chan(uint32_t dma_chan) return ((dma_chan >= 23) && (dma_chan <= 29)); } - static inline void ipu_ch_param_set_buffer(uint32_t ch, int bufNum, dma_addr_t phyaddr) { @@ -588,7 +586,6 @@ int32_t ipu_init_channel(ipu_channel_t channel, ipu_channel_params_t *params) clk_enable(g_ipu_clk); } - if (g_channel_init_mask & (1L << IPU_CHAN_ID(channel))) { printf("Warning: channel already initialized %d\n", IPU_CHAN_ID(channel)); @@ -954,7 +951,6 @@ static void ipu_ch_param_init(int ch, break; } - if (uv_stride) ipu_ch_param_set_field(¶ms, 1, 128, 14, uv_stride - 1); diff --git a/drivers/video/imx/ipu_regs.h b/drivers/video/imx/ipu_regs.h index deb44002d75..8d6ec4845f4 100644 --- a/drivers/video/imx/ipu_regs.h +++ b/drivers/video/imx/ipu_regs.h @@ -353,13 +353,11 @@ struct ipu_dmfc { #define DMFC_GENERAL1 (&DMFC_REG->general[0]) #define DMFC_IC_CTRL (&DMFC_REG->ic_ctrl) - #define DC_REG ((struct ipu_dc *)(IPU_CTRL_BASE_ADDR + \ IPU_DC_REG_BASE)) #define DC_MAP_CONF_PTR(n) (&DC_REG->dc_map_ptr[n / 2]) #define DC_MAP_CONF_VAL(n) (&DC_REG->dc_map_val[n / 2]) - static inline struct ipu_dc_ch *dc_ch_offset(int ch) { switch (ch) { diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c index 3fc5640b71e..9f1ea9c3564 100644 --- a/drivers/video/mvebu_lcd.c +++ b/drivers/video/mvebu_lcd.c @@ -334,7 +334,6 @@ static void mvebu_lcd_register_init(struct mvebu_lcd_info *lcd_info, */ writel(0x00000000, regs + MVEBU_LCD_SPU_SRAM_PARA1); - /* Clock settings in the at 01A8 and in the range F0A0 see below */ /* diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c index a4576c888cf..1470eaf4cab 100644 --- a/drivers/video/pwm_backlight.c +++ b/drivers/video/pwm_backlight.c @@ -250,7 +250,6 @@ static int pwm_backlight_of_to_plat(struct udevice *dev) priv->cur_level = priv->default_level; log_debug("done\n"); - return 0; } diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c index eb881ba4b0e..0ba68dbce3d 100644 --- a/drivers/video/rockchip/rk_edp.c +++ b/drivers/video/rockchip/rk_edp.c @@ -72,7 +72,6 @@ static void rk_edp_init_refclk(struct rk3288_edp *regs, enum rockchip_dp_types c reg ^= REF_CLK_MASK; writel(reg, ®s->pll_reg_1); - writel(LDO_OUTPUT_V_SEL_145 | KVCO_DEFALUT | CHG_PUMP_CUR_SEL_5US | V2L_CUR_SEL_1MA, ®s->pll_reg_2); @@ -314,7 +313,6 @@ static int rk_edp_dpcd_write(struct rk3288_edp *regs, u32 addr, u8 *values, return rk_edp_dpcd_transfer(regs, addr, values, size, DPCD_WRITE); } - static int rk_edp_link_power_up(struct rk_edp_priv *edp) { u8 value; diff --git a/drivers/video/rockchip/rk_mipi.h b/drivers/video/rockchip/rk_mipi.h index 3d1e440b0ec..0d75a263e45 100644 --- a/drivers/video/rockchip/rk_mipi.h +++ b/drivers/video/rockchip/rk_mipi.h @@ -28,5 +28,4 @@ int rk_mipi_dsi_enable(struct udevice *dev, int rk_mipi_phy_enable(struct udevice *dev); - #endif diff --git a/drivers/video/stb_truetype.h b/drivers/video/stb_truetype.h index c6973bb353c..32a7b6e1dc0 100644 --- a/drivers/video/stb_truetype.h +++ b/drivers/video/stb_truetype.h @@ -412,7 +412,6 @@ int main(int arg, char **argv) } #endif - ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// //// @@ -564,7 +563,6 @@ STBTT_DEF void stbtt_GetBakedQuad(const stbtt_bakedchar *chardata, int pw, int p STBTT_DEF void stbtt_GetScaledFontVMetrics(const unsigned char *fontdata, int index, float size, float *ascent, float *descent, float *lineGap); // Query the font vertical metrics without having to create a font first. - ////////////////////////////////////////////////////////////////////////////// // // NEW TEXTURE BAKING API @@ -737,7 +735,6 @@ STBTT_DEF int stbtt_InitFont(stbtt_fontinfo *info, const unsigned char *data, in // need to do anything special to free it, because the contents are pure // value data with no additional data structures. Returns 0 on failure. - ////////////////////////////////////////////////////////////////////////////// // // CHARACTER TO GLYPH-INDEX CONVERSIOn @@ -749,7 +746,6 @@ STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codep // codepoint-based functions. // Returns 0 if the character codepoint is not defined in the font. - ////////////////////////////////////////////////////////////////////////////// // // CHARACTER PROPERTIES @@ -919,7 +915,6 @@ STBTT_DEF void stbtt_MakeGlyphBitmapSubpixelPrefilter(const stbtt_fontinfo *info STBTT_DEF void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1); STBTT_DEF void stbtt_GetGlyphBitmapBoxSubpixel(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y,float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1); - // @TODO: don't expose this structure typedef struct { @@ -994,8 +989,6 @@ STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, floa // The algorithm has not been optimized at all, so expect it to be slow // if computing lots of characters or very large sizes. - - ////////////////////////////////////////////////////////////////////////////// // // Finding the right font... @@ -1017,7 +1010,6 @@ STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, floa // from the file yourself and do your own comparisons on them. // You have to have called stbtt_InitFont() first. - STBTT_DEF int stbtt_FindMatchingFont(const unsigned char *fontdata, const char *name, int flags); // returns the offset (not index) of the font that matches, or -1 if none // if you use STBTT_MACSTYLE_DONTCARE, use a font name like "Arial Bold". @@ -2809,7 +2801,6 @@ typedef struct stbtt__edge { int invert; } stbtt__edge; - typedef struct stbtt__active_edge { struct stbtt__active_edge *next; @@ -4970,7 +4961,6 @@ STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const #endif // STB_TRUETYPE_IMPLEMENTATION - // FULL VERSION HISTORY // // 1.25 (2021-07-11) many fixes diff --git a/drivers/video/sunxi/tve_common.c b/drivers/video/sunxi/tve_common.c index 7bc2b3b2909..b3e9bd98ef1 100644 --- a/drivers/video/sunxi/tve_common.c +++ b/drivers/video/sunxi/tve_common.c @@ -7,7 +7,6 @@ * (C) Copyright 2017 Jernej Skrabec <jernej.skrabec@siol.net> */ - #include <asm/arch/tve.h> #include <asm/io.h> diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c index 763f7ee39fc..b95b14da77d 100644 --- a/drivers/video/tegra124/dp.c +++ b/drivers/video/tegra124/dp.c @@ -627,7 +627,6 @@ static int tegra_dc_dp_calc_config(struct tegra_dp_priv *dp, if (link_cfg->hblank_sym < 0) link_cfg->hblank_sym = 0; - /* * Refer to dev_disp.ref for more information. * # symbols/vblank = ((SetRasterBlankStart.X - diff --git a/drivers/video/videomodes.h b/drivers/video/videomodes.h index 405f4e1fc2c..3c9638670f1 100644 --- a/drivers/video/videomodes.h +++ b/drivers/video/videomodes.h @@ -24,7 +24,6 @@ #define FB_VMODE_SMOOTH_XPAN 512 /* smooth xpan possible (internally used) */ #define FB_VMODE_CONUPDATE 512 /* don't update x/yoffset */ - /****************************************************************** * Resolution Struct ******************************************************************/ diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c index 01a35b3ab30..fced8f3686b 100644 --- a/drivers/watchdog/meson_gxbb_wdt.c +++ b/drivers/watchdog/meson_gxbb_wdt.c @@ -24,7 +24,6 @@ #define GXBB_WDT_CTRL_DIV_MASK GENMASK(17, 0) #define GXBB_WDT_TCNT_SETUP_MASK GENMASK(15, 0) - struct amlogic_wdt_priv { void __iomem *reg_base; }; diff --git a/drivers/watchdog/sandbox_alarm-wdt.c b/drivers/watchdog/sandbox_alarm-wdt.c index 8dbbfc249e7..a7ffca96216 100644 --- a/drivers/watchdog/sandbox_alarm-wdt.c +++ b/drivers/watchdog/sandbox_alarm-wdt.c @@ -56,7 +56,6 @@ static int alarm_wdt_expire_now(struct udevice *dev, ulong flags) return 0; } - static const struct wdt_ops alarm_wdt_ops = { .start = alarm_wdt_start, .reset = alarm_wdt_reset, diff --git a/include/env/phytec/k3_mmc.env b/include/env/phytec/k3_mmc.env new file mode 100644 index 00000000000..3d3595ceb7e --- /dev/null +++ b/include/env/phytec/k3_mmc.env @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2024 PHYTEC Messtechnik GmbH + * Author: Daniel Schultz <d.schultz@phytec.de> + */ + +/* Logic for TI K3 based SoCs to boot from a MMC device. */ + +#include <env/phytec/overlays.env> + +mmcargs=setenv bootargs console=${console} earlycon=${earlycon} + root=/dev/mmcblk${mmcdev}p${mmcroot} rootwait rw +loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} Image +loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile} +mmcboot=run mmcargs; + mmc dev ${mmcdev}; + mmc rescan; + run loadimage; + run loadfdt; + run mmc_apply_overlays; + booti ${loadaddr} - ${fdt_addr_r} diff --git a/include/env/phytec/overlays.env b/include/env/phytec/overlays.env new file mode 100644 index 00000000000..78721cde654 --- /dev/null +++ b/include/env/phytec/overlays.env @@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2024 PHYTEC Messtechnik GmbH + * Author: Benjamin Hahn <b.hahn@phytec.de> + */ + +/* Logic to load and apply overlays. Load overlays from bootenv.txt into + * environment and apply those overlays. + * The variables bootenv_addr_r and fdtoverlay_addr_r are board specific. + * get_cmd can be either tftp or dhcp. */ + +bootenv=bootenv.txt +mmc_load_bootenv=load mmc ${mmcdev}:${mmcpart} ${bootenv_addr_r} ${bootenv} +mmc_load_overlay=load mmc ${mmcdev}:${mmcpart} ${fdtoverlay_addr_r} ${overlay} +mmc_apply_overlays= + fdt address ${fdt_addr_r}; + if test ${no_overlays} = 0; then + for overlay in ${overlays}; + do; + if run mmc_load_overlay; then + fdt resize ${filesize}; + fdt apply ${fdtoverlay_addr_r}; + fi; + done; + fi; +net_load_bootenv=${get_cmd} ${bootenv_addr_r} ${bootenv} +net_load_overlay=${get_cmd} ${fdtoverlay_addr_r} ${overlay} +net_apply_overlays= + fdt address ${fdt_addr_r}; + if test ${no_overlays} = 0; then + for overlay in ${overlays}; + do; + if run net_load_overlay; then + fdt resize ${filesize}; + fdt apply ${fdtoverlay_addr_r}; + fi; + done; + fi; |