Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ea0823465157decd81bc06c3b6dfe8f604ee4471

Authored by Marek Vasut
1 parent a5cad67735
Exists in v2017.01-smarct4x and in 31 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.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_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.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-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, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

arm: socfpga: Switch CONFIG_HOSTNAME to CONFIG_SYS_BOARD 

We already have the CONFIG_SYS_BOARD variable, which defines the name
of the board. The value in CONFIG_HOSTNAME is exactly the same and is
thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD .

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>

Showing 8 changed files with 4 additions and 15 deletions Side-by-side Diff

include/configs/socfpga_arria5_socdk.h
Diff comments   View file @ ea08234
... ... @@ -56,8 +56,6 @@
56 56 #define CONFIG_ENV_OFFSET 512 /* just after the MBR */
57 57  
58 58 /* Extra Environment */
59   -#define CONFIG_HOSTNAME socfpga_arria5
60   -
61 59 #define CONFIG_EXTRA_ENV_SETTINGS \
62 60 "verify=n\0" \
63 61 "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
include/configs/socfpga_common.h
Diff comments   View file @ ea08234
... ... @@ -69,6 +69,10 @@
69 69 #define CONFIG_CMDLINE_EDITING /* Command history etc */
70 70 #define CONFIG_SYS_HUSH_PARSER
71 71  
  72 +#ifndef CONFIG_SYS_HOSTNAME
  73 +#define CONFIG_SYS_HOSTNAME CONFIG_SYS_BOARD
  74 +#endif
  75 +
72 76 /*
73 77 * Cache
74 78 */
include/configs/socfpga_cyclone5_socdk.h
Diff comments   View file @ ea08234
... ... @@ -56,8 +56,6 @@
56 56 #define CONFIG_ENV_OFFSET 512 /* just after the MBR */
57 57  
58 58 /* Extra Environment */
59   -#define CONFIG_HOSTNAME socfpga_cyclone5
60   -
61 59 #define CONFIG_EXTRA_ENV_SETTINGS \
62 60 "verify=n\0" \
63 61 "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
include/configs/socfpga_de0_nano_soc.h
Diff comments   View file @ ea08234
... ... @@ -52,8 +52,6 @@
52 52 #define CONFIG_ENV_OFFSET 512 /* just after the MBR */
53 53  
54 54 /* Extra Environment */
55   -#define CONFIG_HOSTNAME socfpga_de0_nano_soc
56   -
57 55 #define CONFIG_EXTRA_ENV_SETTINGS \
58 56 "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
59 57 "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
include/configs/socfpga_mcvevk.h
Diff comments   View file @ ea08234
... ... @@ -49,8 +49,6 @@
49 49 #define CONFIG_ENV_OFFSET 512 /* just after the MBR */
50 50  
51 51 /* Extra Environment */
52   -#define CONFIG_HOSTNAME mcvevk
53   -
54 52 #define CONFIG_EXTRA_ENV_SETTINGS \
55 53 "consdev=ttyS0\0" \
56 54 "baudrate=115200\0" \
include/configs/socfpga_sockit.h
Diff comments   View file @ ea08234
... ... @@ -52,8 +52,6 @@
52 52 #define CONFIG_ENV_OFFSET 512 /* just after the MBR */
53 53  
54 54 /* Extra Environment */
55   -#define CONFIG_HOSTNAME socfpga_sockit
56   -
57 55 #define CONFIG_EXTRA_ENV_SETTINGS \
58 56 "verify=n\0" \
59 57 "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
include/configs/socfpga_socrates.h
Diff comments   View file @ ea08234
... ... @@ -52,8 +52,6 @@
52 52 #define CONFIG_ENV_OFFSET 512 /* just after the MBR */
53 53  
54 54 /* Extra Environment */
55   -#define CONFIG_HOSTNAME socfpga_socrates
56   -
57 55 #define CONFIG_EXTRA_ENV_SETTINGS \
58 56 "verify=n\0" \
59 57 "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
include/configs/socfpga_sr1500.h
Diff comments   View file @ ea08234
... ... @@ -53,9 +53,6 @@
53 53 #define CONFIG_PHY_MARVELL
54 54 #define PHY_ANEG_TIMEOUT 8000
55 55  
56   -/* Extra Environment */
57   -#define CONFIG_HOSTNAME sr1500
58   -
59 56 #define CONFIG_EXTRA_ENV_SETTINGS \
60 57 "verify=n\0" \
61 58 "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \