env: Migrate CONFIG_ENV_IS_IN_FAT options to Kconfig
We rename the various FAT_ENV_xxx options to CONFIG_ENV_FAT_xxx so that they can be modified via Kconfig. Migrate all existing users to the new values. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
3158eebd21
commit
43ba3c59cb
@ -255,33 +255,10 @@ config ENV_IS_IN_EEPROM
|
||||
config ENV_IS_IN_FAT
|
||||
bool "Environment is in a FAT filesystem"
|
||||
depends on !CHAIN_OF_TRUST
|
||||
select FAT_WRITE
|
||||
help
|
||||
Define this if you want to use the FAT file system for the environment.
|
||||
|
||||
- FAT_ENV_INTERFACE:
|
||||
|
||||
Define this to a string that is the name of the block device.
|
||||
|
||||
- FAT_ENV_DEVICE_AND_PART:
|
||||
|
||||
Define this to a string to specify the partition of the device. It can
|
||||
be as following:
|
||||
|
||||
"D:P", "D:0", "D", "D:" or "D:auto" (D, P are integers. And P >= 1)
|
||||
- "D:P": device D partition P. Error occurs if device D has no
|
||||
partition table.
|
||||
- "D:0": device D.
|
||||
- "D" or "D:": device D partition 1 if device D has partition
|
||||
table, or the whole device D if has no partition
|
||||
table.
|
||||
- "D:auto": first partition in device D with bootable flag set.
|
||||
If none, first valid partition in device D. If no
|
||||
partition table then means device D.
|
||||
|
||||
- FAT_ENV_FILE:
|
||||
|
||||
It's a string of the FAT file name. This file use to store the
|
||||
environment.
|
||||
|
||||
- CONFIG_FAT_WRITE:
|
||||
This must be enabled. Otherwise it cannot save the environment file.
|
||||
@ -570,6 +547,42 @@ config ENV_IS_NOWHERE
|
||||
Define this if you don't want to or can't have an environment stored
|
||||
on a storage medium
|
||||
|
||||
config ENV_FAT_INTERFACE
|
||||
string "Name of the block device for the environment"
|
||||
depends on ENV_IS_IN_FAT
|
||||
default "mmc" if TI_COMMON_CMD_OPTIONS || ARCH_ZYNQMP || ARCH_AT91
|
||||
help
|
||||
Define this to a string that is the name of the block device.
|
||||
|
||||
config ENV_FAT_DEVICE_AND_PART
|
||||
string "Device and partition for where to store the environemt in FAT"
|
||||
depends on ENV_IS_IN_FAT
|
||||
default "0:1" if TI_COMMON_CMD_OPTIONS
|
||||
default "0:auto" if ARCH_ZYNQMP
|
||||
default "0" if ARCH_AT91
|
||||
help
|
||||
Define this to a string to specify the partition of the device. It can
|
||||
be as following:
|
||||
|
||||
"D:P", "D:0", "D", "D:" or "D:auto" (D, P are integers. And P >= 1)
|
||||
- "D:P": device D partition P. Error occurs if device D has no
|
||||
partition table.
|
||||
- "D:0": device D.
|
||||
- "D" or "D:": device D partition 1 if device D has partition
|
||||
table, or the whole device D if has no partition
|
||||
table.
|
||||
- "D:auto": first partition in device D with bootable flag set.
|
||||
If none, first valid partition in device D. If no
|
||||
partition table then means device D.
|
||||
|
||||
config ENV_FAT_FILE
|
||||
string "Name of the FAT file to use for the environemnt"
|
||||
depends on ENV_IS_IN_FAT
|
||||
default "uboot.env"
|
||||
help
|
||||
It's a string of the FAT file name. This file use to store the
|
||||
environment.
|
||||
|
||||
if ARCH_SUNXI
|
||||
|
||||
config ENV_OFFSET
|
||||
|
@ -48,8 +48,8 @@ int saveenv(void)
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
part = blk_get_device_part_str(FAT_ENV_INTERFACE,
|
||||
FAT_ENV_DEVICE_AND_PART,
|
||||
part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
|
||||
CONFIG_ENV_FAT_DEVICE_AND_PART,
|
||||
&dev_desc, &info, 1);
|
||||
if (part < 0)
|
||||
return 1;
|
||||
@ -57,15 +57,15 @@ int saveenv(void)
|
||||
dev = dev_desc->devnum;
|
||||
if (fat_set_blk_dev(dev_desc, &info) != 0) {
|
||||
printf("\n** Unable to use %s %d:%d for saveenv **\n",
|
||||
FAT_ENV_INTERFACE, dev, part);
|
||||
CONFIG_ENV_FAT_INTERFACE, dev, part);
|
||||
return 1;
|
||||
}
|
||||
|
||||
err = file_fat_write(FAT_ENV_FILE, (void *)&env_new, 0, sizeof(env_t),
|
||||
err = file_fat_write(CONFIG_ENV_FAT_FILE, (void *)&env_new, 0, sizeof(env_t),
|
||||
&size);
|
||||
if (err == -1) {
|
||||
printf("\n** Unable to write \"%s\" from %s%d:%d **\n",
|
||||
FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part);
|
||||
CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -82,8 +82,8 @@ void env_relocate_spec(void)
|
||||
int dev, part;
|
||||
int err;
|
||||
|
||||
part = blk_get_device_part_str(FAT_ENV_INTERFACE,
|
||||
FAT_ENV_DEVICE_AND_PART,
|
||||
part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
|
||||
CONFIG_ENV_FAT_DEVICE_AND_PART,
|
||||
&dev_desc, &info, 1);
|
||||
if (part < 0)
|
||||
goto err_env_relocate;
|
||||
@ -91,14 +91,14 @@ void env_relocate_spec(void)
|
||||
dev = dev_desc->devnum;
|
||||
if (fat_set_blk_dev(dev_desc, &info) != 0) {
|
||||
printf("\n** Unable to use %s %d:%d for loading the env **\n",
|
||||
FAT_ENV_INTERFACE, dev, part);
|
||||
CONFIG_ENV_FAT_INTERFACE, dev, part);
|
||||
goto err_env_relocate;
|
||||
}
|
||||
|
||||
err = file_fat_read(FAT_ENV_FILE, buf, CONFIG_ENV_SIZE);
|
||||
err = file_fat_read(CONFIG_ENV_FAT_FILE, buf, CONFIG_ENV_SIZE);
|
||||
if (err == -1) {
|
||||
printf("\n** Unable to read \"%s\" from %s%d:%d **\n",
|
||||
FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part);
|
||||
CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part);
|
||||
goto err_env_relocate;
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ARCH_OMAP2PLUS=y
|
||||
CONFIG_TI_COMMON_CMD_OPTIONS=y
|
||||
CONFIG_AM33XX=y
|
||||
CONFIG_NOR=y
|
||||
CONFIG_SPL_STACK_R_ADDR=0x82000000
|
||||
@ -50,7 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
|
||||
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
|
||||
CONFIG_G_DNL_VENDOR_NUM=0x0451
|
||||
CONFIG_G_DNL_PRODUCT_NUM=0xd022
|
||||
CONFIG_FAT_WRITE=y
|
||||
CONFIG_LZO=y
|
||||
CONFIG_OF_LIBFDT=y
|
||||
CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
|
@ -50,4 +50,3 @@ CONFIG_DM_USB=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_LCD=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
|
@ -50,4 +50,3 @@ CONFIG_USB=y
|
||||
CONFIG_DM_USB=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_LCD=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
|
@ -43,4 +43,3 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
|
||||
CONFIG_DEBUG_UART_ANNOUNCE=y
|
||||
CONFIG_ATMEL_USART=y
|
||||
CONFIG_LCD=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
|
@ -55,4 +55,3 @@ CONFIG_DM_USB=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_LCD=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
|
@ -4,6 +4,8 @@ CONFIG_SYS_TEXT_BASE=0x81000000
|
||||
CONFIG_SYS_CLK_FREQ=750000000
|
||||
CONFIG_DEFAULT_DEVICE_TREE="axs101"
|
||||
CONFIG_ENV_IS_IN_FAT=y
|
||||
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||
CONFIG_BOOTDELAY=3
|
||||
CONFIG_BOARD_EARLY_INIT_F=y
|
||||
CONFIG_SYS_PROMPT="AXS# "
|
||||
|
@ -4,6 +4,8 @@ CONFIG_SYS_TEXT_BASE=0x81000000
|
||||
CONFIG_SYS_CLK_FREQ=100000000
|
||||
CONFIG_DEFAULT_DEVICE_TREE="axs103"
|
||||
CONFIG_ENV_IS_IN_FAT=y
|
||||
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||
CONFIG_BOOTDELAY=3
|
||||
CONFIG_BOARD_EARLY_INIT_F=y
|
||||
CONFIG_SYS_PROMPT="AXS# "
|
||||
|
@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="hikey"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="hi6220-hikey"
|
||||
CONFIG_DISTRO_DEFAULTS=y
|
||||
CONFIG_ENV_IS_IN_FAT=y
|
||||
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||
CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
|
||||
# CONFIG_DISPLAY_CPUINFO is not set
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
CONFIG_BOARD_EARLY_INIT_F=y
|
||||
@ -18,5 +20,4 @@ CONFIG_MMC_DW_K3=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_DWC2=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
|
@ -5,6 +5,8 @@ CONFIG_SYS_TEXT_BASE=0x81000000
|
||||
CONFIG_SYS_CLK_FREQ=1000000000
|
||||
CONFIG_DEFAULT_DEVICE_TREE="hsdk"
|
||||
CONFIG_ENV_IS_IN_FAT=y
|
||||
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||
CONFIG_BOARD_EARLY_INIT_F=y
|
||||
CONFIG_SYS_PROMPT="hsdk# "
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
|
@ -5,6 +5,8 @@ CONFIG_TARGET_OMAP4_PANDA=y
|
||||
# CONFIG_SPL_NAND_SUPPORT is not set
|
||||
CONFIG_DISTRO_DEFAULTS=y
|
||||
CONFIG_ENV_IS_IN_FAT=y
|
||||
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
CONFIG_VERSION_VARIABLE=y
|
||||
@ -28,5 +30,4 @@ CONFIG_SYS_NS16550=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
CONFIG_OF_LIBFDT=y
|
||||
|
@ -36,5 +36,4 @@ CONFIG_USB=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_LCD=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
CONFIG_OF_LIBFDT=y
|
||||
|
@ -4,6 +4,8 @@ CONFIG_TARGET_RPI_2=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
|
||||
CONFIG_DISTRO_DEFAULTS=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||
# CONFIG_DISPLAY_CPUINFO is not set
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
CONFIG_SYS_PROMPT="U-Boot> "
|
||||
|
@ -5,6 +5,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
|
||||
CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
|
||||
CONFIG_DISTRO_DEFAULTS=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||
# CONFIG_DISPLAY_CPUINFO is not set
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
CONFIG_SYS_PROMPT="U-Boot> "
|
||||
|
@ -5,6 +5,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
|
||||
CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
|
||||
CONFIG_DISTRO_DEFAULTS=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||
# CONFIG_DISPLAY_CPUINFO is not set
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
CONFIG_SYS_PROMPT="U-Boot> "
|
||||
|
@ -4,6 +4,8 @@ CONFIG_TARGET_RPI=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b"
|
||||
CONFIG_DISTRO_DEFAULTS=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||
# CONFIG_DISPLAY_CPUINFO is not set
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
CONFIG_SYS_PROMPT="U-Boot> "
|
||||
|
@ -75,4 +75,3 @@ CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_GADGET=y
|
||||
CONFIG_USB_GADGET_ATMEL_USBA=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
|
@ -50,4 +50,3 @@ CONFIG_ATMEL_USART=y
|
||||
CONFIG_DM_SPI=y
|
||||
CONFIG_ATMEL_SPI=y
|
||||
CONFIG_LCD=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
|
@ -66,4 +66,3 @@ CONFIG_USB=y
|
||||
CONFIG_DM_USB=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
|
@ -75,4 +75,3 @@ CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_GADGET=y
|
||||
CONFIG_USB_GADGET_ATMEL_USBA=y
|
||||
CONFIG_LCD=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
|
@ -69,4 +69,3 @@ CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_GADGET=y
|
||||
CONFIG_USB_GADGET_ATMEL_USBA=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
|
@ -73,4 +73,3 @@ CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_GADGET=y
|
||||
CONFIG_USB_GADGET_ATMEL_USBA=y
|
||||
CONFIG_LCD=y
|
||||
CONFIG_FAT_WRITE=y
|
||||
|
@ -33,10 +33,6 @@
|
||||
#define CONFIG_FS_FAT
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_ENV_IS_IN_FAT) && !defined(CONFIG_FAT_WRITE)
|
||||
#define CONFIG_FAT_WRITE
|
||||
#endif
|
||||
|
||||
#if (defined(CONFIG_CMD_EXT4) || defined(CONFIG_CMD_EXT2)) && \
|
||||
!defined(CONFIG_FS_EXT4)
|
||||
#define CONFIG_FS_EXT4
|
||||
|
@ -351,11 +351,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x001c0000
|
||||
#define CONFIG_ENV_OFFSET_REDUND 0x001e0000
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
|
||||
#elif !defined(CONFIG_ENV_IS_NOWHERE)
|
||||
/* Not NAND, SPI, NOR or eMMC env, so put ENV in a file on FAT */
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
#define FAT_ENV_DEVICE_AND_PART "0:1"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
#endif
|
||||
|
||||
/* SPI flash. */
|
||||
|
@ -71,10 +71,6 @@
|
||||
/* NS16550 Configuration */
|
||||
#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
|
||||
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
#define FAT_ENV_DEVICE_AND_PART "0:1"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
|
||||
#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"
|
||||
|
||||
/* SPL USB Support */
|
||||
|
@ -53,9 +53,6 @@
|
||||
#define CONFIG_SYS_MMC_ENV_DEV 0
|
||||
#else
|
||||
/* u-boot env in sd/mmc card */
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
#define FAT_ENV_DEVICE_AND_PART "0"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
#define CONFIG_ENV_SIZE 0x4000
|
||||
#endif
|
||||
|
||||
|
@ -105,14 +105,6 @@
|
||||
"root=/dev/mtdblock7 rw rootfstype=jffs2"
|
||||
#elif CONFIG_SYS_USE_MMC
|
||||
/* bootstrap + u-boot + env + linux in mmc */
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
/*
|
||||
* We don't specify the part number, if device 0 has partition table, it means
|
||||
* the first partition; it no partition table, then take whole device as a
|
||||
* FAT file system.
|
||||
*/
|
||||
#define FAT_ENV_DEVICE_AND_PART "0"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
#define CONFIG_ENV_SIZE 0x4000
|
||||
|
||||
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
|
||||
|
@ -156,9 +156,6 @@
|
||||
#define CONFIG_SYS_MMC_ENV_DEV 0
|
||||
#else
|
||||
/* Use file in FAT file to save environment */
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
#define FAT_ENV_DEVICE_AND_PART "0"
|
||||
#define CONFIG_ENV_SIZE 0x4000
|
||||
#endif
|
||||
|
||||
|
@ -124,9 +124,6 @@
|
||||
#else /* CONFIG_SYS_USE_MMC */
|
||||
|
||||
/* bootstrap + u-boot + env + linux in mmc */
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
#define FAT_ENV_DEVICE_AND_PART "0"
|
||||
#define CONFIG_ENV_SIZE 0x4000
|
||||
#define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 at91sam9rlek.dtb; " \
|
||||
"fatload mmc 0:1 0x22000000 zImage; " \
|
||||
|
@ -139,9 +139,6 @@
|
||||
"bootm 0x22000000"
|
||||
#else /* CONFIG_SYS_USE_MMC */
|
||||
/* bootstrap + u-boot + env + linux in mmc */
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
#define FAT_ENV_DEVICE_AND_PART "0"
|
||||
#define CONFIG_ENV_SIZE 0x4000
|
||||
#endif
|
||||
|
||||
|
@ -76,10 +76,6 @@
|
||||
* Environment settings
|
||||
*/
|
||||
#define CONFIG_ENV_SIZE SZ_16K
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
#define FAT_ENV_DEVICE_AND_PART "0:1"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
#define CONFIG_FAT_WRITE
|
||||
|
||||
/*
|
||||
* Environment configuration
|
||||
|
@ -106,9 +106,6 @@
|
||||
|
||||
/* Preserve environment on sd card */
|
||||
#define CONFIG_ENV_SIZE 0x1000
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
#define FAT_ENV_DEVICE_AND_PART "1:1"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
#define CONFIG_ENV_VARS_UBOOT_CONFIG
|
||||
|
||||
/* Monitor Command Prompt */
|
||||
|
@ -60,10 +60,6 @@
|
||||
* Environment settings
|
||||
*/
|
||||
#define CONFIG_ENV_SIZE SZ_16K
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
#define FAT_ENV_DEVICE_AND_PART "0:1"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
#define CONFIG_FAT_WRITE
|
||||
|
||||
/*
|
||||
* Environment configuration
|
||||
|
@ -88,9 +88,6 @@
|
||||
#define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */
|
||||
|
||||
#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
#define FAT_ENV_DEVICE_AND_PART "0:1"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
|
||||
#define CONFIG_SF_DEFAULT_BUS 1
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
|
@ -33,9 +33,6 @@
|
||||
/* ENV related config options */
|
||||
|
||||
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
#define FAT_ENV_DEVICE_AND_PART "0:1"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
#endif /* __CONFIG_PANDA_H */
|
||||
|
@ -104,14 +104,6 @@
|
||||
|
||||
#ifdef CONFIG_SYS_USE_MMC
|
||||
/* bootstrap + u-boot + env + linux in mmc */
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
/*
|
||||
* We don't specify the part number, if device 0 has partition table, it means
|
||||
* the first partition; it no partition table, then take whole device as a
|
||||
* FAT file system.
|
||||
*/
|
||||
#define FAT_ENV_DEVICE_AND_PART "0"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
#define CONFIG_ENV_SIZE 0x4000
|
||||
|
||||
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
|
||||
|
@ -92,9 +92,6 @@
|
||||
|
||||
/* Environment */
|
||||
#define CONFIG_ENV_SIZE SZ_16K
|
||||
#define FAT_ENV_INTERFACE "mmc"
|
||||
#define FAT_ENV_DEVICE_AND_PART "0:1"
|
||||
#define FAT_ENV_FILE "uboot.env"
|
||||
#define CONFIG_ENV_VARS_UBOOT_CONFIG
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x1000000
|
||||
#define CONFIG_PREBOOT "usb start"
|
||||
|
@ -57,10 +57,8 @@
|
||||
#ifdef CONFIG_SYS_USE_MMC
|
||||
|
||||
/* bootstrap + u-boot + env in sd card */
|
||||
#undef FAT_ENV_DEVICE_AND_PART
|
||||
#undef CONFIG_BOOTCOMMAND
|
||||
|
||||
#define FAT_ENV_DEVICE_AND_PART "1"
|
||||
#define CONFIG_BOOTCOMMAND "fatload mmc 1:1 0x21000000 at91-sama5d2_xplained.dtb; " \
|
||||
"fatload mmc 1:1 0x22000000 zImage; " \
|
||||
"bootz 0x22000000 - 0x21000000"
|
||||
|
@ -73,9 +73,6 @@
|
||||
# ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ
|
||||
# define CONFIG_ZYNQ_SDHCI_MAX_FREQ 200000000
|
||||
# endif
|
||||
# define FAT_ENV_DEVICE_AND_PART "0:auto"
|
||||
# define FAT_ENV_FILE "uboot.env"
|
||||
# define FAT_ENV_INTERFACE "mmc"
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NAND_ARASAN
|
||||
|
Loading…
Reference in New Issue
Block a user