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
global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG
[platform/kernel/u-boot.git]
/
include
/
configs
/
pcl063.h
diff --git
a/include/configs/pcl063.h
b/include/configs/pcl063.h
index
6683f21
..
38dcee0
100644
(file)
--- a/
include/configs/pcl063.h
+++ b/
include/configs/pcl063.h
@@
-11,9
+11,6
@@
#include <linux/sizes.h>
#include "mx6_common.h"
#include <linux/sizes.h>
#include "mx6_common.h"
-/* SPL options */
-#include "imx6_spl.h"
-
/*
* There is a bug in some i.MX6UL processors that results in the initial
* portion of OCRAM being unavailable when booting from (at least) an SD
/*
* There is a bug in some i.MX6UL processors that results in the initial
* portion of OCRAM being unavailable when booting from (at least) an SD
@@
-22,14
+19,14
@@
* Tweak the SPL text base address to avoid this.
*/
* Tweak the SPL text base address to avoid this.
*/
-#define C
ONFIG_SYS_FSL_USDHC_NUM
1
+#define C
FG_SYS_FSL_USDHC_NUM
1
/* Console configs */
/* Console configs */
-#define C
ONFIG_MXC_UART_BASE
UART1_BASE
+#define C
FG_MXC_UART_BASE
UART1_BASE
/* MMC Configs */
/* MMC Configs */
-#define C
ONFIG_SYS_FSL_ESDHC_ADDR
USDHC1_BASE_ADDR
+#define C
FG_SYS_FSL_ESDHC_ADDR
USDHC1_BASE_ADDR
/* Miscellaneous configurable options */
/* Miscellaneous configurable options */
@@
-37,19
+34,18
@@
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
#define PHYS_SDRAM_SIZE SZ_256M
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
#define PHYS_SDRAM_SIZE SZ_256M
-#define C
ONFIG_SYS_SDRAM_BASE
PHYS_SDRAM
-#define C
ONFIG_SYS_INIT_RAM_ADDR
IRAM_BASE_ADDR
-#define C
ONFIG_SYS_INIT_RAM_SIZE
IRAM_SIZE
+#define C
FG_SYS_SDRAM_BASE
PHYS_SDRAM
+#define C
FG_SYS_INIT_RAM_ADDR
IRAM_BASE_ADDR
+#define C
FG_SYS_INIT_RAM_SIZE
IRAM_SIZE
/* NAND */
/* NAND */
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define CONFIG_SYS_NAND_BASE 0x40000000
+#define CFG_SYS_NAND_BASE 0x40000000
/* USB Configs */
/* USB Configs */
-#define C
ONFIG_MXC_USB_PORTSC
(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define C
ONFIG_MXC_USB_FLAGS
0
+#define C
FG_MXC_USB_PORTSC
(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define C
FG_MXC_USB_FLAGS
0
-#define C
ONFI
G_EXTRA_ENV_SETTINGS \
+#define C
F
G_EXTRA_ENV_SETTINGS \
"console=ttymxc0,115200n8\0" \
"fdt_addr_r=0x82000000\0" \
"fdt_high=0xffffffff\0" \
"console=ttymxc0,115200n8\0" \
"fdt_addr_r=0x82000000\0" \
"fdt_high=0xffffffff\0" \
@@
-62,7
+58,7
@@
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
- func(UBIFS, ubifs, 0) \
+ func(UBIFS, ubifs, 0
, UBI, boot
) \
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
func(PXE, pxe, na) \
func(DHCP, dhcp, na)