コミット: 0ee8d7ef03ec84d534b1e12c47f827cc33250ba5 - uboot (git)

コミットメタ情報

• リビジョン: 0ee8d7ef03ec84d534b1e12c47f827cc33250ba5 (tree)
• 日時: 2022-08-01 18:40:22
• 作者: Yoshinori Sato <ysato@user...>
• コミッター: Yoshinori Sato

ログメッセージ

update RX support.

Signed-off-by: Yoshinori Sato <[e-mail]>

変更サマリ

• modified: arch/rx/Kconfig
• modified: configs/qemu-rx_defconfig
• modified: include/configs/qemu-rx.h
• delete: {board/emulation/qemu-rx => arch/rx/cpu}/u-boot.lds

差分

--- a/arch/rx/Kconfig
+++ b/arch/rx/Kconfig
@@ -29,6 +29,7 @@ config CPU_RX62N
 	select DM_SERIAL
 	select TIMER
 	select SCIF_CONSOLE
+	select BINMAN
 
 config SYS_CPU
 	default "rx600" if CPU_RX62N

--- a/board/emulation/qemu-rx/u-boot.lds
+++ b/arch/rx/cpu/u-boot.lds
@@ -51,17 +51,11 @@ SECTIONS
 		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
 		. = ALIGN(4);
 	} > irom
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	} > irom
 	PROVIDE (_etext = .);
 
-	. = 0xffffff80;
-	.vector :
-	{
-		*(.vector);
-	} > vector
-
 	PROVIDE (__ram_vec = 0x00000000);
 
 	.data : AT(_etext)
@@ -78,10 +72,16 @@ SECTIONS
 		*(.bss)
 		. = ALIGN(4);
 	} > sdram
+	. = 0xffffff80;
+	.vector :
+	{
+		*(.vector);
+	} > vector
+
 	PROVIDE (__bss_end = .);
 	PROVIDE (__init_end = .);
 
 	PROVIDE (__stack = 0x00018000);
 
-	PROVIDE (_end = .);
+	PROVIDE (_end = _etext + SIZEOF(.data));
 }

--- a/configs/qemu-rx_defconfig
+++ b/configs/qemu-rx_defconfig
@@ -1,4 +1,8 @@
 CONFIG_RX=y
-CONFIG_ENV_SIZE=0x1f000
+CONFIG_SYS_MALLOC_F_LEN=0x400
+CONFIG_DEFAULT_DEVICE_TREE="qemu-rx"
+CONFIG_SYS_LOAD_ADDR=0x01000000
 CONFIG_TARGET_QEMU=y
+# CONFIG_NET is not set
 CONFIG_DM_ETH=y
+CONFIG_REGEX=y

--- a/include/configs/qemu-rx.h
+++ b/include/configs/qemu-rx.h
@@ -6,7 +6,4 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/* memory */
-#define CONFIG_SYS_LOAD_ADDR		0x1000000
-
 #endif