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-09-01-assorted-Kconfig-migrations' into next
[platform/kernel/u-boot.git]
/
include
/
configs
/
ls1046afrwy.h
diff --git
a/include/configs/ls1046afrwy.h
b/include/configs/ls1046afrwy.h
index
4bebc31
..
2df5f3f
100644
(file)
--- a/
include/configs/ls1046afrwy.h
+++ b/
include/configs/ls1046afrwy.h
@@
-8,21
+8,11
@@
#include "ls1046a_common.h"
#include "ls1046a_common.h"
-#define CONFIG_SYS_CLK_FREQ 100000000
-
-#define CONFIG_LAYERSCAPE_NS_ACCESS
-
-#define CONFIG_DIMM_SLOTS_PER_CTLR 1
-#define CONFIG_CHIP_SELECTS_PER_CTRL 4
-
#define CONFIG_SYS_UBOOT_BASE 0x40100000
#define CONFIG_SYS_UBOOT_BASE 0x40100000
-/* IFC */
-#define CONFIG_FSL_IFC
/*
* NAND Flash Definitions
*/
/*
* NAND Flash Definitions
*/
-#define CONFIG_NAND_FSL_IFC
#define CONFIG_SYS_NAND_BASE 0x7e800000
#define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE
#define CONFIG_SYS_NAND_BASE 0x7e800000
#define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE
@@
-69,8
+59,6
@@
#define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NAND_FTIM3
/* EEPROM */
#define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NAND_FTIM3
/* EEPROM */
-#define CONFIG_SYS_I2C_EEPROM_NXID
-#define CONFIG_SYS_EEPROM_BUS_NUM 0
#define I2C_RETIMER_ADDR 0x18
/* I2C bus multiplexer */
#define I2C_RETIMER_ADDR 0x18
/* I2C bus multiplexer */
@@
-88,13
+76,11
@@
*/
#define CONFIG_SYS_FSL_QSPI_BASE 0x40000000
*/
#define CONFIG_SYS_FSL_QSPI_BASE 0x40000000
-#ifndef CONFIG_SPL_BUILD
#undef BOOT_TARGET_DEVICES
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
func(USB, usb, 0) \
func(DHCP, dhcp, na)
#undef BOOT_TARGET_DEVICES
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
func(USB, usb, 0) \
func(DHCP, dhcp, na)
-#endif
/* FMan */
#ifdef CONFIG_SYS_DPAA_FMAN
/* FMan */
#ifdef CONFIG_SYS_DPAA_FMAN
@@
-106,11
+92,8
@@
#define FDT_SEQ_MACADDR_FROM_ENV
#define FDT_SEQ_MACADDR_FROM_ENV
-#define CONFIG_ETHPRIME "FM1@DTSEC3"
-
#endif
#endif
-#undef CONFIG_BOOTCOMMAND
#define QSPI_NOR_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \
"env exists secureboot && esbc_halt;;"
#define SD_BOOTCOMMAND "run distro_bootcmd;run sd_bootcmd; " \
#define QSPI_NOR_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \
"env exists secureboot && esbc_halt;;"
#define SD_BOOTCOMMAND "run distro_bootcmd;run sd_bootcmd; " \