compilation réusse pour U-Boot 2023.1 => a l'image de l'am335x evm

This commit is contained in:
2023-03-26 18:47:18 +00:00
parent 32c661f78d
commit dcd96023af
8 changed files with 114 additions and 69 deletions

View File

@@ -32,16 +32,18 @@
#include <common.h>
#include <bloblist.h>
#include <binman_sym.h>
@@ -715,10 +717,10 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
default:
debug("Unsupported OS image.. Jumping nevertheless..\n");
}
-#if CONFIG_VAL(SYS_MALLOC_F_LEN) && !defined(CONFIG_SYS_SPL_MALLOC_SIZE)
+//#if CONFIG_VAL(SYS_MALLOC_F_LEN) && !defined(CONFIG_SYS_SPL_MALLOC_SIZE)
debug("SPL malloc() used 0x%lx bytes (%ld KB)\n", gd->malloc_ptr,
gd->malloc_ptr / 1024);
-#endif
+//#endif
bootstage_mark_name(spl_phase() == PHASE_TPL ? BOOTSTAGE_ID_END_TPL :
BOOTSTAGE_ID_END_SPL, "end " SPL_TPL_NAME);
#ifdef CONFIG_BOOTSTAGE_STASH
diff --git a/scripts/dtc/libfdt/fdt.c b/scripts/dtc/libfdt/fdt.c
index 8e4cce3b9b..d95a29daf8 100644
--- a/scripts/dtc/libfdt/fdt.c
+++ b/scripts/dtc/libfdt/fdt.c
@@ -83,8 +83,8 @@ int fdt_check_header(const void *fdt)
{
size_t hdrsize;
- if (fdt_magic(fdt) != FDT_MAGIC)
- return -FDT_ERR_BADMAGIC;
+// if (fdt_magic(fdt) != FDT_MAGIC)
+// return -FDT_ERR_BADMAGIC;
if (fdt_chk_version()) {
if ((fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION)
|| (fdt_last_comp_version(fdt) >

View File

@@ -1,6 +1,15 @@
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -210,5 +210,6 @@ source "board/ti/am43xx/Kconfig"
source "board/ti/am335x/Kconfig"
source "board/compulab/cm_t43/Kconfig"
source "board/phytec/phycore_am335x_r2/Kconfig"
+source "board/silica/pengwyn/Kconfig"
endif
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -105,6 +105,14 @@ config TARGET_AM335X_SL50
@@ -105,6 +105,33 @@ config TARGET_AM335X_SL50
select DM_SERIAL
imply CMD_DM
@@ -11,16 +20,26 @@
+ select DM_GPIO
+ select DM_SERIAL
+ imply CMD_DM
+ imply SPL_DM
+ imply SPL_DM_SEQ_ALIAS
+ imply SPL_ENV_SUPPORT
+ imply SPL_FS_EXT4
+ imply SPL_FS_FAT
+ imply SPL_GPIO
+ imply SPL_I2C
+ imply SPL_LIBCOMMON_SUPPORT
+ imply SPL_LIBDISK_SUPPORT
+ imply SPL_LIBGENERIC_SUPPORT
+ imply SPL_MMC
+ imply SPL_NAND_SUPPORT
+ imply SPL_OF_LIBFDT
+ imply SPL_POWER
+ imply SPL_SEPARATE_BSS
+ imply SPL_SERIAL
+ imply SPL_SYS_MALLOC_SIMPLE
+ imply SPL_WATCHDOG
+ imply SPL_YMODEM_SUPPORT
+
config TARGET_BRXRE1
bool "Support BRXRE1"
select BOARD_LATE_INIT
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -210,5 +210,6 @@ source "board/ti/am43xx/Kconfig"
source "board/ti/am335x/Kconfig"
source "board/compulab/cm_t43/Kconfig"
source "board/phytec/phycore_am335x_r2/Kconfig"
+source "board/silica/pengwyn/Kconfig"
endif

View File

@@ -10,8 +10,6 @@ config SYS_SOC
default "am33xx"
config SYS_CONFIG_NAME
default "pengwyn"
source "board/ti/common/Kconfig"
default "am335x_pengwyn"
endif

View File

@@ -4,7 +4,7 @@
#
# Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
ifeq ($(CONFIG_SKIP_LOWLEVEL_INIT),)
ifeq ($(CONFIG_$(SPL_)SKIP_LOWLEVEL_INIT),)
obj-y := mux.o
endif

View File

@@ -0,0 +1,54 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* pengwyn.h
*
* Copyright (C) 2013 Lothar Felten <lothar.felten@gmail.com>
*
* based on am335x_evm.h, Copyright (C) 2011 Texas Instruments Inc.
*/
#ifndef __CONFIG_AM335X_PENGWYN_H
#define __CONFIG_AM335X_PENGWYN_H
#include <configs/ti_am335x_common.h>
/* Clock Defines */
#define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK)
/* NAND Configuration. */
#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \
10, 11, 12, 13, 14, 15, 16, 17, \
18, 19, 20, 21, 22, 23, 24, 25, \
26, 27, 28, 29, 30, 31, 32, 33, \
34, 35, 36, 37, 38, 39, 40, 41, \
42, 43, 44, 45, 46, 47, 48, 49, \
50, 51, 52, 53, 54, 55, 56, 57, \
58, 59, 60, 61, 62, 63, 64, 65, \
66, 67, 68, 69, 70, 71, 72, 73, \
74, 75, 76, 77, 78, 79, 80, 81, \
82, 83, 84, 85, 86, 87, 88, 89, \
90, 91, 92, 93, 94, 95, 96, 97, \
98, 99, 100, 101, 102, 103, 104, 105, \
106, 107, 108, 109, 110, 111, 112, 113, \
114, 115, 116, 117, 118, 119, 120, 121, \
122, 123, 124, 125, 126, 127, 128, 129, \
130, 131, 132, 133, 134, 135, 136, 137, \
138, 139, 140, 141, 142, 143, 144, 145, \
146, 147, 148, 149, 150, 151, 152, 153, \
154, 155, 156, 157, 158, 159, 160, 161, \
162, 163, 164, 165, 166, 167, 168, 169, \
170, 171, 172, 173, 174, 175, 176, 177, \
178, 179, 180, 181, 182, 183, 184, 185, \
186, 187, 188, 189, 190, 191, 192, 193, \
194, 195, 196, 197, 198, 199, 200, 201, \
202, 203, 204, 205, 206, 207, 208, 209, }
#define CONFIG_SYS_NAND_ECCSIZE 512
#define CONFIG_SYS_NAND_ECCBYTES 26
#define CONFIG_SYS_NAND_ECCSTEPS 8
#define CONFIG_SYS_NAND_ECCTOTAL (CONFIG_SYS_NAND_ECCBYTES * CONFIG_SYS_NAND_ECCSTEPS)
/* END NAND Configuration. */
/* NS16550 Configuration: primary UART via FTDI */
#define CONFIG_SYS_NS16550_COM1 0x44e09000
#endif /* ! __CONFIG_AM335X_PENGWYN_H */

View File

@@ -228,3 +228,15 @@ int board_eth_init(struct bd_info *bis)
return n;
}
#endif /* if CONFIG_DRIVER_TI_CPSW */
int ft_board_setup(void *blob, struct bd_info *bd)
{
return 0;
}
#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
return 0;
}
#endif

View File

@@ -1,40 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* pengwyn.h
*
* Copyright (C) 2013 Lothar Felten <lothar.felten@gmail.com>
*
* based on am335x_evm.h, Copyright (C) 2011 Texas Instruments Inc.
*/
#ifndef __CONFIG_PENGWYN_H
#define __CONFIG_PENGWYN_H
#include <configs/ti_am335x_common.h>
/* Clock Defines */
#define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK)
/* NAND Configuration. */
#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,\
18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,\
34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,\
50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,\
66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,\
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,\
98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,\
114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,\
134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,\
154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,\
174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,\
194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,}
#define CONFIG_SYS_NAND_ECCSIZE 512
#define CONFIG_SYS_NAND_ECCBYTES 26
#define CONFIG_SYS_NAND_ECCSTEPS 8
#define CONFIG_SYS_NAND_ECCTOTAL (CONFIG_SYS_NAND_ECCBYTES * CONFIG_SYS_NAND_ECCSTEPS)
/* END NAND Configuration. */
/* NS16550 Configuration: primary UART via FTDI */
#define CONFIG_SYS_NS16550_COM1 0x44e09000
#endif /* ! __CONFIG_PENGWYN_H */

View File

@@ -16,7 +16,7 @@ SRC_URI = " \
file://MAINTAINERS \
file://Makefile \
file://mux.c \
file://pengwyn.h \
file://am335x_pengwyn.h \
file://pengwyn_defconfig \
file://am335x-pengwyn.dts \
file://am335x-pengwyn-u-boot.dtsi \
@@ -43,7 +43,7 @@ do_configure:prepend() {
install -m 0644 ${WORKDIR}/pengwyn_defconfig ${S}/configs
install -d ${S}/include/configs/
install -m 0644 ${WORKDIR}/pengwyn.h ${S}/include/configs/
install -m 0644 ${WORKDIR}/am335x_pengwyn.h ${S}/include/configs/
install -d ${S}/arch/arm/dts
install -m 0644 ${WORKDIR}/am335x-pengwyn.dts ${S}/arch/arm/dts