From 90b9479b38e95015f80755f882df436a401ac03f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 19 Jul 2024 12:48:52 +0200 Subject: board: freescale: Remove duplicate newlines Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/freescale/common/cadmus.c | 5 ----- board/freescale/common/cadmus.h | 4 ---- board/freescale/common/eeprom.h | 3 --- board/freescale/common/fsl_validate.c | 2 -- board/freescale/imx8mn_evk/ddr4_timing.c | 1 - board/freescale/imx8mn_evk/ddr4_timing_ld.c | 2 -- board/freescale/ls1012ardb/ls1012ardb.c | 1 - board/freescale/ls1021aiot/ls1021aiot.c | 1 - board/freescale/ls1043aqds/ls1043aqds.c | 1 - board/freescale/ls1088a/ddr.c | 1 - board/freescale/ls2080aqds/ddr.c | 1 - board/freescale/ls2080aqds/ddr.h | 1 - board/freescale/ls2080ardb/ddr.c | 1 - board/freescale/ls2080ardb/ddr.h | 1 - board/freescale/m5249evb/m5249evb.c | 2 -- board/freescale/m5253demo/m5253demo.c | 1 - board/freescale/m5275evb/m5275evb.c | 1 - board/freescale/mpc8548cds/ddr.c | 1 - board/freescale/mx6sabreauto/mx6sabreauto.c | 3 --- board/freescale/mx6sllevk/mx6sllevk.c | 1 - board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 1 - board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 -- board/freescale/p1010rdb/p1010rdb.c | 1 - board/freescale/t102xrdb/cpld.h | 1 - board/freescale/t104xrdb/eth.c | 1 - board/freescale/t208xqds/t208xqds_qixis.h | 1 - board/freescale/t208xqds/tlb.c | 1 - board/freescale/t208xrdb/tlb.c | 1 - board/freescale/t4rdb/ddr.c | 1 - board/freescale/t4rdb/ddr.h | 1 - board/freescale/vf610twr/vf610twr.c | 1 - 31 files changed, 46 deletions(-) diff --git a/board/freescale/common/cadmus.c b/board/freescale/common/cadmus.c index 6f66ed6851..e5ecd0e19c 100644 --- a/board/freescale/common/cadmus.c +++ b/board/freescale/common/cadmus.c @@ -3,7 +3,6 @@ * Copyright 2004, 2011 Freescale Semiconductor. */ - #include #include #include @@ -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 fb74e8f6db..93cea12084 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 328fd3974b..1d0685fde6 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 e03434dcdf..657f4533bc 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 77611ea026..ce39c9e2bc 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 a3577efd0b..d719b5916f 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 7f8001b498..5f0564f1b2 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 7abc412693..2fdac87bc2 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 fdf011efc5..2ecf5a74a0 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 d2e239c4d6..54b432ad79 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 2986ffb7a8..d19c061e12 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 b5d790a4a0..465155e56b 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 ec34b42e61..a1a97f9f8c 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 c5f2a95211..43301dc72a 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 717dc087e0..68524e5e68 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 d0b01f8174..446a79e672 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 e1d94fc9a3..8b986d4242 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 14202cd5a7..4b8ddcc3ae 100644 --- a/board/freescale/mpc8548cds/ddr.c +++ b/board/freescale/mpc8548cds/ddr.c @@ -3,7 +3,6 @@ * Copyright 2008 Freescale Semiconductor, Inc. */ - #include #include diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index e782543c0f..bab62fd442 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 7114444fc3..9e39e39ac9 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 6176f73823..d80cfd4ab2 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 6b0665a106..e5a0197e2f 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 #include - 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 ab0031440a..e386840d9e 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 bd40cc319a..b504c3fcc4 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 d5c084e319..c35ec368a4 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 0f9a45a6fd..6665142203 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 f99d51c8cd..a4cc532acd 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 df5831541f..a9a03908df 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 5b60b50c67..bbe31d4a54 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 74a2779611..241b13475d 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 80a798af9c..bfb49ad860 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[] = { -- cgit v1.2.3