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 tag 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video...
[platform/kernel/u-boot.git]
/
include
/
configs
/
novena.h
diff --git
a/include/configs/novena.h
b/include/configs/novena.h
index
3876412
..
c11d13a
100644
(file)
--- a/
include/configs/novena.h
+++ b/
include/configs/novena.h
@@
-9,7
+9,6
@@
#define __CONFIG_H
/* System configurations */
#define __CONFIG_H
/* System configurations */
-#define CONFIG_KEYBOARD
#include "mx6_common.h"
#include "mx6_common.h"
@@
-26,7
+25,6
@@
*/
/* Booting Linux */
*/
/* Booting Linux */
-#define CONFIG_BOOTFILE "fitImage"
#define CONFIG_HOSTNAME "novena"
/* Physical Memory Map */
#define CONFIG_HOSTNAME "novena"
/* Physical Memory Map */
@@
-41,8
+39,6
@@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024)
-
/* SPL */
#include "imx6_spl.h" /* common IMX6 SPL configuration */
/* SPL */
#include "imx6_spl.h" /* common IMX6 SPL configuration */
@@
-52,20
+48,10
@@
#endif
/* I2C */
#endif
/* I2C */
-#define CONFIG_SYS_I2C_LEGACY
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
#define CONFIG_I2C_MULTI_BUS
#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_SPD_BUS_NUM 0
/* I2C EEPROM */
#define CONFIG_SYS_SPD_BUS_NUM 0
/* I2C EEPROM */
-#ifdef CONFIG_CMD_EEPROM
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
-#define CONFIG_SYS_I2C_EEPROM_BUS 2
-#endif
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
@@
-80,8
+66,6
@@
#endif
/* PMIC */
#endif
/* PMIC */
-#define CONFIG_POWER
-#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
@@
-101,7
+85,6
@@
#endif
/* Video output */
#endif
/* Video output */
-#define CONFIG_VIDEO_LOGO
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
@@
-115,10
+98,10
@@
"bootdev=/dev/mmcblk0p1\0" \
"rootdev=/dev/mmcblk0p2\0" \
"netdev=eth0\0" \
"bootdev=/dev/mmcblk0p1\0" \
"rootdev=/dev/mmcblk0p2\0" \
"netdev=eth0\0" \
- "kernel_addr_r="__stringify(CONFIG_
LOADADDR)"\0"
\
- "pxefile_addr_r="__stringify(CONFIG_
LOADADDR)"\0"
\
- "scriptaddr="__stringify(CONFIG_
LOADADDR)"\0"
\
- "ramdisk_addr_r=0x28000000\0" \
+ "kernel_addr_r="__stringify(CONFIG_
SYS_LOAD_ADDR)"\0"
\
+ "pxefile_addr_r="__stringify(CONFIG_
SYS_LOAD_ADDR)"\0"
\
+ "scriptaddr="__stringify(CONFIG_
SYS_LOAD_ADDR)"\0"
\
+ "ramdisk_addr_r=0x28000000\0" \
"fdt_addr_r=0x18000000\0" \
"fdtfile=imx6q-novena.dtb\0" \
"stdout=serial,vidconsole\0" \
"fdt_addr_r=0x18000000\0" \
"fdtfile=imx6q-novena.dtb\0" \
"stdout=serial,vidconsole\0" \