[RFC 3/4] WIP: make it work on litex

Antony Pavlov antonynpavlov at gmail.com
Sun Jun 2 00:31:00 PDT 2019


  * litex platform does not use ns16550 at all
    so debug_ll_ns16550_init should be eliminated;

  * there is no IH_ARCH_RISCV definition in include/image.h
    at the moment, so the error stops compiling:
        common/bootm.c: In function 'bootm_open_os_uimage':
        common/bootm.c:491:34: error: 'IH_ARCH' undeclared (first use in this
        function)
        if (data->os->header.ih_arch != IH_ARCH) {
                                        ^~~~~~~

Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>
---
 arch/riscv/boot/start.S | 2 --
 common/bootm.c          | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/riscv/boot/start.S b/arch/riscv/boot/start.S
index d1dbe48b7b..fab23e926f 100644
--- a/arch/riscv/boot/start.S
+++ b/arch/riscv/boot/start.S
@@ -28,8 +28,6 @@
 
 .globl _start
 _start:
-	debug_ll_ns16550_init
-
 	riscv_nmon
 
 	li	sp, STACK_BASE + STACK_SIZE
diff --git a/common/bootm.c b/common/bootm.c
index 36f6c41bbd..37379ef03f 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -487,11 +487,13 @@ static int bootm_open_os_uimage(struct image_data *data)
 
 	uimage_print_contents(data->os);
 
+#if 0
 	if (data->os->header.ih_arch != IH_ARCH) {
 		printf("Unsupported Architecture 0x%x\n",
 		       data->os->header.ih_arch);
 		return -EINVAL;
 	}
+#endif
 
 	if (data->os_address == UIMAGE_SOME_ADDRESS)
 		data->os_address = data->os->header.ih_load;
-- 
2.20.1




More information about the barebox mailing list