Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d1459f0fab1ac145051a74094c96592c694f84af

Authored by Igor Grinberg
Committed by Stefano Babic
1 parent e3150460a4
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, imx_v2015.04_4.1.15_1.0.0_ga, 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.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, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

env: move extern default_environment[] to environment.h 

Extract all extern declarations for default_environment[] out of c files
into the environment.h header.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Stefan Roese <sr@denx.de>

Showing 11 changed files with 2 additions and 24 deletions Side-by-side Diff

... ... @@ -40,7 +40,6 @@
40 40  
41 41 extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
42 42 extern env_t *env_ptr;
43   -extern uchar default_environment[];
44 43  
45 44 ulong flash_get_size(ulong base, int banknum);
46 45 void env_crc_update(void);
common/env_dataflash.c
Diff comments   View file @ d1459f0
... ... @@ -37,8 +37,6 @@
37 37 unsigned long addr_src, unsigned long size);
38 38 extern int AT91F_DataflashInit(void);
39 39  
40   -extern uchar default_environment[];
41   -
42 40 uchar env_get_char_spec(int index)
43 41 {
44 42 uchar c;
... ... @@ -74,8 +74,6 @@
74 74 static ulong end_addr_new = CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1;
75 75 #endif /* CONFIG_ENV_ADDR_REDUND */
76 76  
77   -extern const uchar default_environment[];
78   -
79 77  
80 78 uchar env_get_char_spec(int index)
81 79 {
... ... @@ -27,9 +27,6 @@
27 27 #include <linux/stddef.h>
28 28 #include <mg_disk.h>
29 29  
30   -/* references to names in env_common.c */
31   -extern uchar default_environment[];
32   -
33 30 char *env_name_spec = "MG_DISK";
34 31  
35 32 env_t *env_ptr = 0;
... ... @@ -32,9 +32,6 @@
32 32 #include <search.h>
33 33 #include <errno.h>
34 34  
35   -/* references to names in env_common.c */
36   -extern uchar default_environment[];
37   -
38 35 char *env_name_spec = "MMC";
39 36  
40 37 #ifdef ENV_IS_EMBEDDED
... ... @@ -55,9 +55,6 @@
55 55 #define CONFIG_ENV_RANGE CONFIG_ENV_SIZE
56 56 #endif
57 57  
58   -/* references to names in env_common.c */
59   -extern uchar default_environment[];
60   -
61 58 char *env_name_spec = "NAND";
62 59  
63 60  
common/env_nowhere.c
Diff comments   View file @ d1459f0
... ... @@ -33,8 +33,6 @@
33 33  
34 34 env_t *env_ptr = NULL;
35 35  
36   -extern uchar default_environment[];
37   -
38 36 void env_relocate_spec(void)
39 37 {
40 38 }
... ... @@ -59,8 +59,6 @@
59 59  
60 60 char * env_name_spec = "NVRAM";
61 61  
62   -extern uchar default_environment[];
63   -
64 62 uchar env_get_char_spec(int index)
65 63 {
66 64 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
common/env_onenand.c
Diff comments   View file @ d1459f0
... ... @@ -39,9 +39,6 @@
39 39 extern struct mtd_info onenand_mtd;
40 40 extern struct onenand_chip onenand_chip;
41 41  
42   -/* References to names in env_common.c */
43   -extern uchar default_environment[];
44   -
45 42 char *env_name_spec = "OneNAND";
46 43  
47 44 #define ONENAND_MAX_ENV_SIZE 4096
... ... @@ -55,9 +55,6 @@
55 55  
56 56 DECLARE_GLOBAL_DATA_PTR;
57 57  
58   -/* references to names in env_common.c */
59   -extern uchar default_environment[];
60   -
61 58 char * env_name_spec = "SPI Flash";
62 59  
63 60 static struct spi_flash *env_flash;
include/environment.h
Diff comments   View file @ d1459f0
... ... @@ -154,6 +154,8 @@
154 154 unsigned char data[ENV_SIZE]; /* Environment data */
155 155 } env_t;
156 156  
  157 +extern const unsigned char default_environment[];
  158 +
157 159 #ifndef DO_DEPS_ONLY
158 160  
159 161 #include <search.h>