mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-01 00:49:43 +00:00
global: Migrate CONFIG_MFG_ENV_SETTINGS to CFG
Perform a simple rename of CONFIG_MFG_ENV_SETTINGS to CFG_MFG_ENV_SETTINGS Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
8a897c4f97
commit
8f52920a4a
6 changed files with 12 additions and 12 deletions
|
@ -60,7 +60,7 @@
|
||||||
"${loadaddr} ${m4_0_image}\0" \
|
"${loadaddr} ${m4_0_image}\0" \
|
||||||
"m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \
|
"m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \
|
||||||
|
|
||||||
#define CONFIG_MFG_ENV_SETTINGS \
|
#define CFG_MFG_ENV_SETTINGS \
|
||||||
MFG_ENV_SETTINGS_DEFAULT \
|
MFG_ENV_SETTINGS_DEFAULT \
|
||||||
"initrd_addr=0x83100000\0" \
|
"initrd_addr=0x83100000\0" \
|
||||||
"initrd_high=0xffffffffffffffff\0" \
|
"initrd_high=0xffffffffffffffff\0" \
|
||||||
|
@ -68,7 +68,7 @@
|
||||||
|
|
||||||
/* Initial environment variables */
|
/* Initial environment variables */
|
||||||
#define CFG_EXTRA_ENV_SETTINGS \
|
#define CFG_EXTRA_ENV_SETTINGS \
|
||||||
CONFIG_MFG_ENV_SETTINGS \
|
CFG_MFG_ENV_SETTINGS \
|
||||||
M4_BOOT_ENV \
|
M4_BOOT_ENV \
|
||||||
AHAB_ENV \
|
AHAB_ENV \
|
||||||
ENV_COMMON \
|
ENV_COMMON \
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
#define FEC0_RESET IMX_GPIO_NR(2, 5)
|
#define FEC0_RESET IMX_GPIO_NR(2, 5)
|
||||||
#define FEC0_PDOMAIN "conn_enet0"
|
#define FEC0_PDOMAIN "conn_enet0"
|
||||||
|
|
||||||
#define CONFIG_MFG_ENV_SETTINGS \
|
#define CFG_MFG_ENV_SETTINGS \
|
||||||
"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
|
"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
|
||||||
"rdinit=/linuxrc " \
|
"rdinit=/linuxrc " \
|
||||||
"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
|
"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
|
|
||||||
/* Initial environment variables */
|
/* Initial environment variables */
|
||||||
#define CFG_EXTRA_ENV_SETTINGS \
|
#define CFG_EXTRA_ENV_SETTINGS \
|
||||||
CONFIG_MFG_ENV_SETTINGS \
|
CFG_MFG_ENV_SETTINGS \
|
||||||
M4_BOOT_ENV \
|
M4_BOOT_ENV \
|
||||||
"script=boot.scr\0" \
|
"script=boot.scr\0" \
|
||||||
"image=Image\0" \
|
"image=Image\0" \
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
#undef BOOTENV_RUN_NET_USB_START
|
#undef BOOTENV_RUN_NET_USB_START
|
||||||
#define BOOTENV_RUN_NET_USB_START ""
|
#define BOOTENV_RUN_NET_USB_START ""
|
||||||
|
|
||||||
#define CONFIG_MFG_ENV_SETTINGS \
|
#define CFG_MFG_ENV_SETTINGS \
|
||||||
"mfgtool_args=setenv bootargs ${consoleargs} " \
|
"mfgtool_args=setenv bootargs ${consoleargs} " \
|
||||||
"rdinit=/linuxrc g_mass_storage.stall=0 " \
|
"rdinit=/linuxrc g_mass_storage.stall=0 " \
|
||||||
"g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \
|
"g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \
|
||||||
|
@ -59,7 +59,7 @@
|
||||||
#define CFG_EXTRA_ENV_SETTINGS \
|
#define CFG_EXTRA_ENV_SETTINGS \
|
||||||
AHAB_ENV \
|
AHAB_ENV \
|
||||||
BOOTENV \
|
BOOTENV \
|
||||||
CONFIG_MFG_ENV_SETTINGS \
|
CFG_MFG_ENV_SETTINGS \
|
||||||
M4_BOOT_ENV \
|
M4_BOOT_ENV \
|
||||||
MEM_LAYOUT_ENV_SETTINGS \
|
MEM_LAYOUT_ENV_SETTINGS \
|
||||||
"boot_file=Image\0" \
|
"boot_file=Image\0" \
|
||||||
|
|
|
@ -24,13 +24,13 @@
|
||||||
#define CFG_FEC_MXC_PHYADDR 0
|
#define CFG_FEC_MXC_PHYADDR 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CONFIG_MFG_ENV_SETTINGS \
|
#define CFG_MFG_ENV_SETTINGS \
|
||||||
"initrd_addr=0x43800000\0" \
|
"initrd_addr=0x43800000\0" \
|
||||||
"initrd_high=0xffffffff\0" \
|
"initrd_high=0xffffffff\0" \
|
||||||
|
|
||||||
/* Initial environment variables */
|
/* Initial environment variables */
|
||||||
#define CFG_EXTRA_ENV_SETTINGS \
|
#define CFG_EXTRA_ENV_SETTINGS \
|
||||||
CONFIG_MFG_ENV_SETTINGS \
|
CFG_MFG_ENV_SETTINGS \
|
||||||
"script=boot.scr\0" \
|
"script=boot.scr\0" \
|
||||||
"image=Image\0" \
|
"image=Image\0" \
|
||||||
"console=ttymxc0,115200\0" \
|
"console=ttymxc0,115200\0" \
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#define MFG_NAND_PARTITION ""
|
#define MFG_NAND_PARTITION ""
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CONFIG_MFG_ENV_SETTINGS \
|
#define CFG_MFG_ENV_SETTINGS \
|
||||||
"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
|
"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
|
||||||
"rdinit=/linuxrc " \
|
"rdinit=/linuxrc " \
|
||||||
"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
|
"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
|
|
||||||
/* Initial environment variables */
|
/* Initial environment variables */
|
||||||
#define CFG_EXTRA_ENV_SETTINGS \
|
#define CFG_EXTRA_ENV_SETTINGS \
|
||||||
CONFIG_MFG_ENV_SETTINGS \
|
CFG_MFG_ENV_SETTINGS \
|
||||||
M4_BOOT_ENV \
|
M4_BOOT_ENV \
|
||||||
"script=boot.scr\0" \
|
"script=boot.scr\0" \
|
||||||
"image=Image\0" \
|
"image=Image\0" \
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#define UPDATE_M4_ENV ""
|
#define UPDATE_M4_ENV ""
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CONFIG_MFG_ENV_SETTINGS \
|
#define CFG_MFG_ENV_SETTINGS \
|
||||||
"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
|
"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
|
||||||
"rdinit=/linuxrc " \
|
"rdinit=/linuxrc " \
|
||||||
"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
|
"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
|
|
||||||
#define CFG_EXTRA_ENV_SETTINGS \
|
#define CFG_EXTRA_ENV_SETTINGS \
|
||||||
UPDATE_M4_ENV \
|
UPDATE_M4_ENV \
|
||||||
CONFIG_MFG_ENV_SETTINGS \
|
CFG_MFG_ENV_SETTINGS \
|
||||||
CFG_DFU_ENV_SETTINGS \
|
CFG_DFU_ENV_SETTINGS \
|
||||||
"script=boot.scr\0" \
|
"script=boot.scr\0" \
|
||||||
"image=zImage\0" \
|
"image=zImage\0" \
|
||||||
|
|
Loading…
Reference in a new issue