Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 236c49a1c89f959e0b96c87a712688ba93abd3c4

Authored by Marek Vasut
Committed by Stefan Roese
1 parent 2d7cb5b426
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

mtd: cfi: staticize functions 

Staticize a few functions and variables which are no longer exposed.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>

Showing 3 changed files with 4 additions and 11 deletions Side-by-side Diff

drivers/mtd/cfi_flash.c
Diff comments   View file @ 236c49a
... ... @@ -178,7 +178,7 @@
178 178 /*-----------------------------------------------------------------------
179 179 */
180 180 #if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
181   -flash_info_t *flash_get_info(ulong base)
  181 +static flash_info_t *flash_get_info(ulong base)
182 182 {
183 183 int i;
184 184 flash_info_t *info;
... ... @@ -355,8 +355,8 @@
355 355 /*
356 356 * Write a proper sized command to the correct address
357 357 */
358   -void flash_write_cmd (flash_info_t * info, flash_sect_t sect,
359   - uint offset, u32 cmd)
  358 +static void flash_write_cmd(flash_info_t *info, flash_sect_t sect,
  359 + uint offset, u32 cmd)
360 360 {
361 361  
362 362 void *addr;
... ... @@ -2298,7 +2298,7 @@
2298 2298 /*-----------------------------------------------------------------------
2299 2299 */
2300 2300  
2301   -void flash_protect_default(void)
  2301 +static void flash_protect_default(void)
2302 2302 {
2303 2303 #if defined(CONFIG_SYS_FLASH_AUTOPROTECT_LIST)
2304 2304 int i;
... ... @@ -81,7 +81,6 @@
81 81 /* Prototypes */
82 82  
83 83 extern unsigned long flash_init (void);
84   -extern void flash_protect_default(void);
85 84 extern void flash_print_info (flash_info_t *);
86 85 extern int flash_erase (flash_info_t *, int, int);
87 86 extern int flash_sect_erase (ulong addr_first, ulong addr_last);
... ... @@ -112,10 +111,6 @@
112 111 extern ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info);
113 112 extern int jedec_flash_match(flash_info_t *info, ulong base);
114 113 #define CFI_CMDSET_AMD_LEGACY 0xFFF0
115   -#endif
116   -
117   -#if defined(CONFIG_SYS_FLASH_CFI)
118   -extern flash_info_t *flash_get_info(ulong base);
119 114 #endif
120 115  
121 116 /*-----------------------------------------------------------------------
include/mtd/cfi_flash.h
Diff comments   View file @ 236c49a
... ... @@ -165,8 +165,6 @@
165 165 #define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS
166 166 #endif
167 167  
168   -void flash_write_cmd(flash_info_t * info, flash_sect_t sect,
169   - uint offset, u32 cmd);
170 168 phys_addr_t cfi_flash_bank_addr(int i);
171 169 unsigned long cfi_flash_bank_size(int i);
172 170 void flash_cmd_reset(flash_info_t *info);