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 'rpi-2023.04' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi
[platform/kernel/u-boot.git]
/
include
/
configs
/
usbarmory.h
diff --git
a/include/configs/usbarmory.h
b/include/configs/usbarmory.h
index
a2bc3cd
..
27e61f5
100644
(file)
--- a/
include/configs/usbarmory.h
+++ b/
include/configs/usbarmory.h
@@
-17,18
+17,17
@@
/* U-Boot general configurations */
/* UART */
/* U-Boot general configurations */
/* UART */
-#define C
ONFIG_MXC_UART_BASE
UART1_BASE
+#define C
FG_MXC_UART_BASE
UART1_BASE
/* SD/MMC */
#define CFG_SYS_FSL_ESDHC_ADDR 0
/* USB */
/* SD/MMC */
#define CFG_SYS_FSL_ESDHC_ADDR 0
/* USB */
-#define C
ONFIG_MXC_USB_PORT
1
-#define C
ONFIG_MXC_USB_PORTSC
(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define C
ONFIG_MXC_USB_FLAGS
0
+#define C
FG_MXC_USB_PORT
1
+#define C
FG_MXC_USB_PORTSC
(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define C
FG_MXC_USB_FLAGS
0
/* Linux boot */
/* Linux boot */
-#define CONFIG_HOSTNAME "usbarmory"
#define BOOT_TARGET_DEVICES(func) func(MMC, mmc, 0)
#define BOOT_TARGET_DEVICES(func) func(MMC, mmc, 0)
@@
-41,7
+40,7
@@
"pxefile_addr_r=0x70800000\0" \
"ramdisk_addr_r=0x73000000\0"
"pxefile_addr_r=0x70800000\0" \
"ramdisk_addr_r=0x73000000\0"
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#define C
FG_EXTRA_ENV_SETTINGS
\
MEM_LAYOUT_ENV_SETTINGS \
"bootargs_default=root=/dev/mmcblk0p1 rootwait rw\0" \
"fdtfile=imx53-usbarmory.dtb\0" \
MEM_LAYOUT_ENV_SETTINGS \
"bootargs_default=root=/dev/mmcblk0p1 rootwait rw\0" \
"fdtfile=imx53-usbarmory.dtb\0" \