projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2022-02-08-Kconfig-updates'
[platform/kernel/u-boot.git]
/
include
/
configs
/
wandboard.h
diff --git
a/include/configs/wandboard.h
b/include/configs/wandboard.h
index
a0a78ea
..
80e8fe1
100644
(file)
--- a/
include/configs/wandboard.h
+++ b/
include/configs/wandboard.h
@@
-12,26
+12,16
@@
#include "imx6_spl.h"
#include "imx6_spl.h"
-#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD_IMX6
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
-
-#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
/* SATA Configs */
#ifdef CONFIG_CMD_SATA
#define CONFIG_MXC_UART_BASE UART1_BASE
/* SATA Configs */
#ifdef CONFIG_CMD_SATA
-#define CONFIG_SYS_SATA_MAX_DEVICE 1
#define CONFIG_DWC_AHSATA_PORT_ID 0
#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR
#define CONFIG_LBA48
#endif
#define CONFIG_DWC_AHSATA_PORT_ID 0
#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR
#define CONFIG_LBA48
#endif
-#define CONFIG_SYS_MEMTEST_START 0x10000000
-#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
-
/* MMC Configuration */
#define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
/* MMC Configuration */
#define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
@@
-41,11
+31,6
@@
#define CONFIG_MXC_USB_FLAGS 0
/* Framebuffer */
#define CONFIG_MXC_USB_FLAGS 0
/* Framebuffer */
-#define CONFIG_VIDEO_BMP_RLE8
-#define CONFIG_SPLASH_SCREEN
-#define CONFIG_SPLASH_SCREEN_ALIGN
-#define CONFIG_BMP_16BPP
-#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
@@
-53,7
+38,7
@@
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttymxc0\0" \
"splashpos=m,m\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttymxc0\0" \
"splashpos=m,m\0" \
- "splashimage=" __stringify(CONFIG_
LOAD
ADDR) "\0" \
+ "splashimage=" __stringify(CONFIG_
SYS_LOAD_
ADDR) "\0" \
"fdtfile=undefined\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"fdtfile=undefined\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
@@
-93,11
+78,11
@@
"setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \
"if test $fdtfile = undefined; then " \
"echo WARNING: Could not determine dtb to use; fi; \0" \
"setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \
"if test $fdtfile = undefined; then " \
"echo WARNING: Could not determine dtb to use; fi; \0" \
- "kernel_addr_r=" __stringify(CONFIG_
LOAD
ADDR) "\0" \
- "pxefile_addr_r=" __stringify(CONFIG_
LOAD
ADDR) "\0" \
+ "kernel_addr_r=" __stringify(CONFIG_
SYS_LOAD_
ADDR) "\0" \
+ "pxefile_addr_r=" __stringify(CONFIG_
SYS_LOAD_
ADDR) "\0" \
"ramdisk_addr_r=0x13000000\0" \
"ramdiskaddr=0x13000000\0" \
"ramdisk_addr_r=0x13000000\0" \
"ramdiskaddr=0x13000000\0" \
- "scriptaddr=" __stringify(CONFIG_
LOAD
ADDR) "\0" \
+ "scriptaddr=" __stringify(CONFIG_
SYS_LOAD_
ADDR) "\0" \
BOOTENV
#define BOOT_TARGET_DEVICES(func) \
BOOTENV
#define BOOT_TARGET_DEVICES(func) \
@@
-110,6
+95,7
@@
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
+#include <linux/stringify.h>
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
@@
-124,9
+110,5
@@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* Environment organization */
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* Environment organization */
-#define CONFIG_ENV_SIZE (8 * 1024)
-
-#define CONFIG_ENV_OFFSET (768 * 1024)
-#define CONFIG_SYS_MMC_ENV_DEV 0
#endif /* __CONFIG_H * */
#endif /* __CONFIG_H * */