Commit: 40136aff3a34b5d59f2b389b635138501c7c4a0b - uboot (git)

Commit MetaInfo

• Revision: 40136aff3a34b5d59f2b389b635138501c7c4a0b (tree)
• Time: 2022-08-01 18:42:25
• Author: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Log Message

RX: binman support.

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

Change Summary

• modified: Makefile
• add: arch/rx/dts/u-boot.dtsi
• add: tools/binman/etype/rx_vector.py

Incremental Difference

--- a/Makefile
+++ b/Makefile
@@ -1014,6 +1014,8 @@ INPUTS-$(CONFIG_X86) += u-boot-x86-start16.bin u-boot-x86-reset16.bin \
 	$(if $(CONFIG_SPL_X86_16BIT_INIT),spl/u-boot-spl.bin) \
 	$(if $(CONFIG_TPL_X86_16BIT_INIT),tpl/u-boot-tpl.bin)
 
+INPUTS-$(CONFIG_RX) += u-boot-rx-vector.bin
+
 LDFLAGS_u-boot += $(LDFLAGS_FINAL)
 
 # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards.
@@ -1268,7 +1270,8 @@ spl/u-boot-spl.srec: spl/u-boot-spl FORCE
 
 OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \
 		$(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) \
-		$(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR),$(if $(CONFIG_OF_EMBED),,-R .bootpg -R .resetvec))
+		$(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR),$(if $(CONFIG_OF_EMBED),,-R .bootpg -R .resetvec)) \
+		$(if $(CONFIG_RX),-R .vector)
 
 binary_size_check: u-boot-nodtb.bin FORCE
 	@file_size=$(shell wc -c u-boot-nodtb.bin | awk '{print $$1}') ; \
@@ -1654,6 +1657,13 @@ u-boot-x86-reset16.bin: u-boot FORCE
 
 endif # CONFIG_X86
 
+ifdef CONFIG_RX
+OBJCOPYFLAGS_u-boot-rx-vector.bin := -O binary -j .vector
+u-boot-rx-vector.bin: u-boot FORCE
+	$(call if_changed,objcopy)
+
+endif # CONFIG_RX
+
 OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI)
 u-boot-app.efi: u-boot FORCE
 	$(call if_changed,zobjcopy)

--- /dev/null
+++ b/arch/rx/dts/u-boot.dtsi
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2022 Yoshinori Sato
+ */
+
+#include <config.h>
+
+/ {
+	binman {
+		filename = "u-boot-with-dtb.bin";
+		skip-at-start = <CONFIG_SYS_TEXT_BASE>;
+		sort-by-offset;
+		pad-byte = <0xff>;
+		u-boot-nodtb {
+		};
+		u-boot-dtb {
+		};
+		fdtmap {
+		};
+		rx-vector {
+			offset = <0xffffff80>;
+		};
+	};
+};

--- /dev/null
+++ b/tools/binman/etype/rx_vector.py
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: GPL-2.0+
+# Copyright (c) 2022 Yoshinori Sato
+#
+# Entry-type module for the RX CPU exception vector for U-Boot
+#
+
+from binman.entry import Entry
+from binman.etype.blob import Entry_blob
+
+class Entry_rx_vector(Entry_blob):
+    """RX CPU exception vector for U-Boot
+
+    Properties / Entry arguments:
+        - filename: Filename of u-boot-rx-vector.bin (default
+            'u-boot-rx-vector.bin')
+
+    RX CPU have exception vector table in top of memory area.
+    """
+    def __init__(self, section, etype, node):
+        super().__init__(section, etype, node)
+
+    def GetDefaultFilename(self):
+        return 'u-boot-rx-vector.bin'