Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 4cb06d3edff9e39a1e0b0bbfd110b9e219158412

Authored by Mario Six
1 parent 8014c16201
Exists in smarc_8mq_lf_v2020.04 and in 9 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_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

MPC8349ITX: Migrate to CONFIG_TARGET_MPC8349ITX 

Use the proper CONFIG_TARGET_MPC8349ITX Kconfig option to replace the
CONFIG_MPC8349ITX ad-hoc config option.

Signed-off-by: Mario Six <mario.six@gdsys.cc>

Showing 5 changed files with 3 additions and 6 deletions Side-by-side Diff

board/freescale/mpc8349itx/mpc8349itx.c
Diff comments   View file @ 4cb06d3
... ... @@ -152,7 +152,7 @@
152 152  
153 153 int checkboard(void)
154 154 {
155   -#ifdef CONFIG_MPC8349ITX
  155 +#ifdef CONFIG_TARGET_MPC8349ITX
156 156 puts("Board: Freescale MPC8349E-mITX\n");
157 157 #else
158 158 puts("Board: Freescale MPC8349E-mITX-GP\n");
configs/MPC8349ITX_LOWBOOT_defconfig
Diff comments   View file @ 4cb06d3
... ... @@ -4,7 +4,6 @@
4 4 CONFIG_TARGET_MPC8349ITX=y
5 5 CONFIG_OF_BOARD_SETUP=y
6 6 CONFIG_OF_STDOUT_VIA_ALIAS=y
7   -CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX"
8 7 CONFIG_BOOTDELAY=6
9 8 CONFIG_USE_BOOTARGS=y
10 9 CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitx:eth0:off console=ttyS0,115200"
configs/MPC8349ITX_defconfig
Diff comments   View file @ 4cb06d3
... ... @@ -4,7 +4,6 @@
4 4 CONFIG_TARGET_MPC8349ITX=y
5 5 CONFIG_OF_BOARD_SETUP=y
6 6 CONFIG_OF_STDOUT_VIA_ALIAS=y
7   -CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX"
8 7 CONFIG_BOOTDELAY=6
9 8 CONFIG_USE_BOOTARGS=y
10 9 CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitx:eth0:off console=ttyS0,115200"
include/configs/MPC8349ITX.h
Diff comments   View file @ 4cb06d3
... ... @@ -54,7 +54,7 @@
54 54 * On-board devices
55 55 */
56 56  
57   -#ifdef CONFIG_MPC8349ITX
  57 +#ifdef CONFIG_TARGET_MPC8349ITX
58 58 /* The CF card interface on the back of the board */
59 59 #define CONFIG_COMPACT_FLASH
60 60 #define CONFIG_VSC7385_ENET /* VSC7385 ethernet support */
... ... @@ -642,7 +642,7 @@
642 642 /* U-Boot image on TFTP server */
643 643 #define CONFIG_UBOOTPATH "u-boot.bin"
644 644  
645   -#ifdef CONFIG_MPC8349ITX
  645 +#ifdef CONFIG_TARGET_MPC8349ITX
646 646 #define CONFIG_FDTFILE "mpc8349emitx.dtb"
647 647 #else
648 648 #define CONFIG_FDTFILE "mpc8349emitxgp.dtb"
scripts/config_whitelist.txt
Diff comments   View file @ 4cb06d3
... ... @@ -1222,7 +1222,6 @@
1222 1222 CONFIG_MONITOR_IS_IN_RAM
1223 1223 CONFIG_MPC8313ERDB
1224 1224 CONFIG_MPC8315ERDB
1225   -CONFIG_MPC8349ITX
1226 1225 CONFIG_MPC837XEMDS
1227 1226 CONFIG_MPC837XERDB
1228 1227 CONFIG_MPC83XX_GPIO