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
imx6/imx7: Remove now empty imx6_spl.h and imx7_spl.h
[platform/kernel/u-boot.git]
/
include
/
configs
/
liteboard.h
diff --git
a/include/configs/liteboard.h
b/include/configs/liteboard.h
index
d74b2bb
..
1d51b87
100644
(file)
--- a/
include/configs/liteboard.h
+++ b/
include/configs/liteboard.h
@@
-13,18
+13,13
@@
#include <linux/stringify.h>
#include "mx6_common.h"
#include <linux/stringify.h>
#include "mx6_common.h"
-/* SPL options */
-#include "imx6_spl.h"
-
#define CONFIG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
#ifdef CONFIG_FSL_USDHC
#define CONFIG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
#ifdef CONFIG_FSL_USDHC
-#define C
ONFIG_SYS_FSL_ESDHC_ADDR
USDHC1_BASE_ADDR
+#define C
FG_SYS_FSL_ESDHC_ADDR
USDHC1_BASE_ADDR
#endif
#endif
-#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"image=zImage\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"image=zImage\0" \
@@
-36,8
+31,8
@@
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
- "mmcpart=
" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "
\0" \
- "mmcroot=
" CONFIG_MMCROOT "
rootwait rw\0" \
+ "mmcpart=
1
\0" \
+ "mmcroot=
/dev/mmcblk0p2
rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
@@
-87,19
+82,6
@@
"bootz; " \
"fi;\0"
"bootz; " \
"fi;\0"
-#define CONFIG_BOOTCOMMAND \
- "mmc dev ${mmcdev};" \
- "if mmc rescan; then " \
- "if run loadbootscript; then " \
- "run bootscript; " \
- "else " \
- "if run loadimage; then " \
- "run mmcboot; " \
- "else run netboot; " \
- "fi; " \
- "fi; " \
- "else run netboot; fi"
-
/* Miscellaneous configurable options */
/* Physical Memory Map */
/* Miscellaneous configurable options */
/* Physical Memory Map */
@@
-109,29
+91,18
@@
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
-#define CONFIG_SYS_INIT_SP_OFFSET \
- (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
- (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
/* FLASH and environment organization */
/* FLASH and environment organization */
-#define CONFIG_MMCROOT "/dev/mmcblk0p2"
/* USB Configs */
#ifdef CONFIG_CMD_USB
/* USB Configs */
#ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
#ifdef CONFIG_CMD_NET
#define CONFIG_FEC_ENET_DEV 0
#endif
#ifdef CONFIG_CMD_NET
#define CONFIG_FEC_ENET_DEV 0
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x0
#define CONFIG_FEC_MXC_PHYADDR 0x0
-#define CONFIG_FEC_XCV_TYPE RMII
-#define CONFIG_ETHPRIME "FEC"
#endif
#endif
#endif
#endif