* [Buildroot] [PATCH v2 01/11] package: elf2flt: fix config menu entry description
2022-05-30 3:38 [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Damien Le Moal via buildroot
@ 2022-05-30 3:38 ` Damien Le Moal via buildroot
2022-05-30 10:03 ` Alistair Francis
2022-05-30 18:59 ` Thomas Petazzoni via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 02/11] package: elf2flt: Update RISC-V 64-bits support Damien Le Moal via buildroot
` (10 subsequent siblings)
11 siblings, 2 replies; 23+ messages in thread
From: Damien Le Moal via buildroot @ 2022-05-30 3:38 UTC (permalink / raw)
To: buildroot, Thomas Petazzoni
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN
From: Damien Le Moal <damien.lemoal@wdc.com>
Keep the same style as other config menu entries by removing the
question mark at the end of the elf2flt enable config option
description.
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
---
package/elf2flt/Config.in.host | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/elf2flt/Config.in.host b/package/elf2flt/Config.in.host
index 2bab0095c2..339ed06b40 100644
--- a/package/elf2flt/Config.in.host
+++ b/package/elf2flt/Config.in.host
@@ -1,5 +1,5 @@
config BR2_PACKAGE_HOST_ELF2FLT
- bool "Enable elf2flt support?"
+ bool "Enable elf2flt support"
depends on BR2_arm || BR2_sh || BR2_sparc || BR2_xtensa || BR2_RISCV_64
depends on !BR2_USE_MMU
help
--
2.36.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Buildroot] [PATCH v2 01/11] package: elf2flt: fix config menu entry description
2022-05-30 3:38 ` [Buildroot] [PATCH v2 01/11] package: elf2flt: fix config menu entry description Damien Le Moal via buildroot
@ 2022-05-30 10:03 ` Alistair Francis
2022-05-30 18:59 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 23+ messages in thread
From: Alistair Francis @ 2022-05-30 10:03 UTC (permalink / raw)
To: Damien Le Moal
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN, Thomas Petazzoni,
buildroot
On Mon, May 30, 2022 at 1:38 PM Damien Le Moal via buildroot
<buildroot@buildroot.org> wrote:
>
> From: Damien Le Moal <damien.lemoal@wdc.com>
>
> Keep the same style as other config menu entries by removing the
> question mark at the end of the elf2flt enable config option
> description.
>
> Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
> Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> package/elf2flt/Config.in.host | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/elf2flt/Config.in.host b/package/elf2flt/Config.in.host
> index 2bab0095c2..339ed06b40 100644
> --- a/package/elf2flt/Config.in.host
> +++ b/package/elf2flt/Config.in.host
> @@ -1,5 +1,5 @@
> config BR2_PACKAGE_HOST_ELF2FLT
> - bool "Enable elf2flt support?"
> + bool "Enable elf2flt support"
> depends on BR2_arm || BR2_sh || BR2_sparc || BR2_xtensa || BR2_RISCV_64
> depends on !BR2_USE_MMU
> help
> --
> 2.36.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Buildroot] [PATCH v2 01/11] package: elf2flt: fix config menu entry description
2022-05-30 3:38 ` [Buildroot] [PATCH v2 01/11] package: elf2flt: fix config menu entry description Damien Le Moal via buildroot
2022-05-30 10:03 ` Alistair Francis
@ 2022-05-30 18:59 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 23+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-05-30 18:59 UTC (permalink / raw)
To: Damien Le Moal via buildroot
Cc: Niklas Cassel, Damien Le Moal, Alistair Francis, Yann E . MORIN
Hello Damien,
On Mon, 30 May 2022 12:38:26 +0900
Damien Le Moal via buildroot <buildroot@buildroot.org> wrote:
> From: Damien Le Moal <damien.lemoal@wdc.com>
>
> Keep the same style as other config menu entries by removing the
> question mark at the end of the elf2flt enable config option
> description.
>
> Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
> Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
Thanks for the patch, however I think that the correct fix is in fact
to drop this option entirely. Indeed, it doesn't do anything, and it
shouldn't do anything.
What decides whether host-elf2flt should be built or not is the
BR2_BINFMT_FLAT option in arch/Config.in. It is depending on this
option that the gcc package decides to build host-elf2flt:
package/gcc/gcc.mk: $(if $(BR2_BINFMT_FLAT),host-elf2flt)
BR2_PACKAGE_HOST_ELF2FLT is only used in the definition of
BR2_STRIP_strip:
config BR2_STRIP_strip
bool "strip target binaries"
default y
depends on !BR2_PACKAGE_HOST_ELF2FLT
and this should be replaced by:
depends on BR2_BINFMT_ELF
So I think we should really get rid of package/elf2flt/Config.in.host
entirely.
Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH v2 02/11] package: elf2flt: Update RISC-V 64-bits support
2022-05-30 3:38 [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Damien Le Moal via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 01/11] package: elf2flt: fix config menu entry description Damien Le Moal via buildroot
@ 2022-05-30 3:38 ` Damien Le Moal via buildroot
2022-05-30 19:06 ` Thomas Petazzoni via buildroot
2022-07-25 14:44 ` Thomas Petazzoni via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 03/11] board: Add common Linux kernel support for RISCV NOMMU builds Damien Le Moal via buildroot
` (9 subsequent siblings)
11 siblings, 2 replies; 23+ messages in thread
From: Damien Le Moal via buildroot @ 2022-05-30 3:38 UTC (permalink / raw)
To: buildroot, Thomas Petazzoni
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN
From: Damien Le Moal <damien.lemoal@wdc.com>
Remove the old elf2flt 0002-elf2flt-add-riscv-64-bits-support.patch
patch file for riscv64 architecture and replace it with 3 patches:
(1) The first patch fixes the data section alignment
(2) The second patch fixes a bug with the handling of the eh_frame
section causing text and data section overlap problems.
(3) The third patch adds a simpler riscv64 flat bin relocation support.
These 3 patches are submitted to the upstream elf2flt project as pull
request #22:
https://github.com/uclinux-dev/elf2flt/pull/22
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
---
...tate-32-byte-alignment-for-.data-sec.patch | 81 +++++++++++++++++++
...f2flt-fix-.eh_frame-section-handling.patch | 73 +++++++++++++++++
...4-elf2flt-add-riscv-64-bits-support.patch} | 80 +++++++-----------
3 files changed, 181 insertions(+), 53 deletions(-)
create mode 100644 package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch
create mode 100644 package/elf2flt/0003-elf2flt-fix-.eh_frame-section-handling.patch
rename package/elf2flt/{0002-elf2flt-add-riscv-64-bits-support.patch => 0004-elf2flt-add-riscv-64-bits-support.patch} (52%)
diff --git a/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch b/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch
new file mode 100644
index 0000000000..015b3ab988
--- /dev/null
+++ b/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch
@@ -0,0 +1,81 @@
+From 85ba5664eb368eb1cbd2c30b7cd574acd75edd4c Mon Sep 17 00:00:00 2001
+From: Niklas Cassel <niklas.cassel@wdc.com>
+Date: Mon, 4 Apr 2022 15:30:24 +0200
+Subject: [PATCH 1/3] elf2flt.ld: reinstate 32 byte alignment for .data section
+
+Commit 8a3e74446fe7 ("allow to build arm flat binaries") moved the
+following commands:
+ . = ALIGN(0x20) ;
+ @SYMBOL_PREFIX@_etext = . ;
+from the .text section to the top level in the SECTIONS node.
+
+The .text output section is being directed to a memory region using the
+"> flatmem :text" output section attribute. Commands in the top level in
+the SECTIONS node are not.
+
+This means that the ALIGN() command is no longer being appended to the
+flatmem memory region, it will simply update the Location Counter.
+
+The heuristic for placing an output section is described here:
+https://sourceware.org/binutils/docs-2.38/ld.html#Output-Section-Address
+
+"If an output memory region is set for the section then it is added to this
+region and its address will be the next free address in that region."
+
+Since the .data section is being directed to the same memory region as the
+.text section, this means that the Location Counter is not used when
+assigning an address to the .data output section, it will simply use the
+next free address.
+
+No longer directing these commands to the flatmem memory region means that
+the .data output section is no longer aligned to a 32 byte boundary.
+
+Before commit 8a3e74446fe7 ("allow to build arm flat binaries"):
+$ readelf -S busybox_unstripped.gdb | grep data
+ [ 3] .data PROGBITS 0000000000035ac0 00036ac0
+$ readelf -s busybox_unstripped.gdb | grep _etext
+ 19286: 0000000000035ac0 0 NOTYPE GLOBAL DEFAULT 1 _etext
+
+After commit 8a3e74446fe7 ("allow to build arm flat binaries"):
+$ readelf -S busybox_unstripped.gdb | grep data
+ [ 3] .data PROGBITS 0000000000035ab0 00036ab0
+$ readelf -s busybox_unstripped.gdb | grep _etext
+ 19287: 0000000000035ac0 0 NOTYPE GLOBAL DEFAULT 3 _etext
+
+The .data output section has to be aligned to a 32 byte boundary, see the
+FLAT_DATA_ALIGN 0x20 macro and its usage in fs/binfmt_flat.c:
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/fs/binfmt_flat.c?h=v5.17#n59
+
+Readd an explicit ALIGN attribute on the .data section itself, since the
+linker will obey this attribute regardless if being directed to a memory
+region or not. Also remove the ALIGN() command before the .data section,
+since this misleads the reader to think that the Location Counter is used
+when assigning an address to the .data section, when it actually is not.
+
+Fixes: 8a3e74446fe7 ("allow to build arm flat binaries")
+Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
+---
+ elf2flt.ld.in | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/elf2flt.ld.in b/elf2flt.ld.in
+index 0df999d..e5aea14 100644
+--- a/elf2flt.ld.in
++++ b/elf2flt.ld.in
+@@ -94,12 +94,9 @@ W_RODAT: *(.gnu.linkonce.r*)
+ *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+ } > flatmem
+ @SYMBOL_PREFIX@__exidx_end = .;
+-
+- . = ALIGN(0x20) ;
+ @SYMBOL_PREFIX@_etext = . ;
+
+- .data : {
+- . = ALIGN(0x4) ;
++ .data ALIGN(0x20): {
+ @SYMBOL_PREFIX@_sdata = . ;
+ @SYMBOL_PREFIX@__data_start = . ;
+ @SYMBOL_PREFIX@data_start = . ;
+--
+2.35.1
+
diff --git a/package/elf2flt/0003-elf2flt-fix-.eh_frame-section-handling.patch b/package/elf2flt/0003-elf2flt-fix-.eh_frame-section-handling.patch
new file mode 100644
index 0000000000..e690dc3484
--- /dev/null
+++ b/package/elf2flt/0003-elf2flt-fix-.eh_frame-section-handling.patch
@@ -0,0 +1,73 @@
+From 8b7fdb1dedfb8a6e858b46e5af33029fe0462ab8 Mon Sep 17 00:00:00 2001
+From: Damien Le Moal <damien.lemoal@opensource.wdc.com>
+Date: Tue, 10 May 2022 23:14:36 +0900
+Subject: [PATCH 2/3] elf2flt: fix .eh_frame section handling
+
+elf2flt.ld linker script positions the .eh_frame section in an output
+section after the .text and .data output sections.
+
+However, when elf2flt.c is supplied the ELF linked using the elf2flt.ld
+linker script, it only looks at the flags for each input section, and
+then puts it in either a bFLT text, data or bss output section.
+
+Commit ba379d08bb7 ("elf2flt: fix for segfault on some ARM ELFs")
+modified the section scanning loop of elf2flt main() function to put
+read-only relocation data sections in the bFLT text output section so
+that the .ARM.exidx section is placed in the .text flat output section.
+Previously a read-only relocation data section would be put in the data
+output section.
+
+On ARM, the .eh_frame section does not have the SEC_RELOC flag set, so
+it will still end up in the data output section. However, on
+architectures that generates the .eh_frame section with the SEC_RELOC
+flag set, this section will now be placed in the text output section.
+
+The logic in elf2flt will handle all sections in order, and since the
+input order is .text, .data, and .eh_frame, putting .eh_frame in text
+output section does not work, since elf2flt.c has already put the .data
+input section in the bFLT data output section. This leads to the
+following print (example for riscv64 architecture):
+
+buildroot/output/host/riscv64-buildroot-linux-uclibc/bin/elf2flt:
+ERROR: text=0x3bab8 overlaps data=0x33f60 ?
+
+The way that elf2flt is written, we cannot append to the text output
+section after an input section has been added to the data output
+section. It might be possible to change this, but that would require
+moving all the code the was already placed in the data output section.
+
+Instead, let's allow putting a read-only relocation data section in the
+text output section (so that .ARM.exidx will still be placed correctly),
+but only if there has not yet been anything placed in the data output
+section.
+
+That way .ARM.exidx will still be placed correctly, and .eh_frame will
+be placed correctly in the .data output section, regardless if it has
+flag SEC_RELOC set or not.
+
+Fixes: ba379d08bb7 ("elf2flt: fix for segfault on some ARM ELFs")
+Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
+Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
+---
+ elf2flt.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/elf2flt.c b/elf2flt.c
+index 7ac0617..da25e93 100644
+--- a/elf2flt.c
++++ b/elf2flt.c
+@@ -1877,8 +1877,9 @@ int main(int argc, char *argv[])
+ bfd_vma sec_vma;
+
+ if ((s->flags & SEC_CODE) ||
+- ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) ==
+- (SEC_DATA | SEC_READONLY | SEC_RELOC))) {
++ (((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) ==
++ (SEC_DATA | SEC_READONLY | SEC_RELOC)) &&
++ !data_len)) {
+ vma = &text_vma;
+ len = &text_len;
+ } else if (s->flags & SEC_DATA) {
+--
+2.35.1
+
diff --git a/package/elf2flt/0002-elf2flt-add-riscv-64-bits-support.patch b/package/elf2flt/0004-elf2flt-add-riscv-64-bits-support.patch
similarity index 52%
rename from package/elf2flt/0002-elf2flt-add-riscv-64-bits-support.patch
rename to package/elf2flt/0004-elf2flt-add-riscv-64-bits-support.patch
index c530bc020d..15c191c83d 100644
--- a/package/elf2flt/0002-elf2flt-add-riscv-64-bits-support.patch
+++ b/package/elf2flt/0004-elf2flt-add-riscv-64-bits-support.patch
@@ -1,4 +1,4 @@
-From 3879965dfda08a24e7d44ed76bbcc2f4a41df1fa Mon Sep 17 00:00:00 2001
+From 3f1f323feb5cf25d8c80861991d0360784f4d2e6 Mon Sep 17 00:00:00 2001
From: Damien Le Moal <damien.lemoal@wdc.com>
Date: Wed, 9 Sep 2020 17:31:33 +0900
Subject: [PATCH] elf2flt: add riscv 64-bits support
@@ -6,32 +6,28 @@ Subject: [PATCH] elf2flt: add riscv 64-bits support
Add support for riscv 64bits ISA by defining the relocation types
R_RISCV_32_PCREL, R_RISCV_ADD32, R_RISCV_SUB32, R_RISCV_32 and
R_RISCV_64. riscv64 support also needs the __global_pointer$ symbol to
-be defined right after the relocation tables in the data section.
-Furthermore, the .got and .got.plt sections must be reversed. These 2
-requirements are handled with runtime modifications of the default
-linker script using the append_sed() function.
-(1) For the .got.plt and .got sections order swap, append_sed() is used
-to rename "(.got.plt)" to "(.got.tmp)" and to rename "(.got)" to
-"(.got.plt)". A last call finalize the name swap by replacing
-"(.got.tmp)" with "(.got)"
-(2) For the global pointer synbol, a definition line starting with
-"RISCV_GP" is added. The "RISCV_GP" string is removed if the target CPU
-type is riscv64. The definition line is dropped for other CPU types.
+be defined right after the relocation tables in the data section. To
+define this symbol, the "RISCV_GP" line prefix is added. The "RISCV_GP"
+string is removed if the target CPU type is riscv64 and the definition
+line is dropped for other CPU types.
-With these changes, buildroot/busybox builds and run on NOMMU
-systems with kernel 5.13. Tested on Canaan Kendryte K210 boards.
+With these changes, buildroot and busybox build and run on riscv NOMMU
+systems with Linux kernel including patch 6045ab5fea4c
+("binfmt_flat: do not stop relocating GOT entries prematurely on riscv")
+fixing the binfmt_flat loader. Tested on QEMU and Canaan Kendryte K210
+boards.
This patch is based on earlier work by Christoph Hellwig <hch@lst.de>.
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
---
- elf2flt.c | 23 +++++++++++++++++++++++
+ elf2flt.c | 16 ++++++++++++++++
elf2flt.ld.in | 1 +
- ld-elf2flt.c | 16 ++++++++++++++++
- 3 files changed, 40 insertions(+)
+ ld-elf2flt.c | 8 ++++++++
+ 3 files changed, 25 insertions(+)
diff --git a/elf2flt.c b/elf2flt.c
-index ea6b5a1..7100c20 100644
+index da25e93..a03ea3a 100644
--- a/elf2flt.c
+++ b/elf2flt.c
@@ -81,6 +81,8 @@ const char *elf2flt_progname;
@@ -52,14 +48,16 @@ index ea6b5a1..7100c20 100644
#else
#error "Don't know how to support your CPU architecture??"
#endif
-@@ -821,6 +825,16 @@ output_relocs (
+@@ -812,6 +816,18 @@ output_relocs (
goto good_32bit_resolved_reloc;
default:
goto bad_resolved_reloc;
+#elif defined(TARGET_riscv64)
+ case R_RISCV_32_PCREL:
+ case R_RISCV_ADD32:
++ case R_RISCV_ADD64:
+ case R_RISCV_SUB32:
++ case R_RISCV_SUB64:
+ continue;
+ case R_RISCV_32:
+ case R_RISCV_64:
@@ -69,27 +67,11 @@ index ea6b5a1..7100c20 100644
#else
default:
/* The default is to assume that the
-@@ -1841,6 +1855,15 @@ int main(int argc, char *argv[])
- if (!load_to_ram && !pfile)
- load_to_ram = 1;
-
-+#if defined(TARGET_riscv64)
-+ /*
-+ * riscv only supports loading text and data contiguously.
-+ * So fail if load_to_ram is false.
-+ */
-+ if (!load_to_ram)
-+ fatal("Loading to RAM ('-r' option) is required");
-+#endif
-+
- fname = argv[argc-1];
-
- if (pfile) {
diff --git a/elf2flt.ld.in b/elf2flt.ld.in
-index 0df999d..f1eed1f 100644
+index e5aea14..950849e 100644
--- a/elf2flt.ld.in
+++ b/elf2flt.ld.in
-@@ -109,6 +109,7 @@ W_RODAT: *(.gnu.linkonce.r*)
+@@ -106,6 +106,7 @@ W_RODAT: *(.gnu.linkonce.r*)
. = ALIGN(0x20) ;
LONG(-1)
. = ALIGN(0x20) ;
@@ -98,32 +80,24 @@ index 0df999d..f1eed1f 100644
R_RODAT: *(.rodata1)
R_RODAT: *(.rodata.*)
diff --git a/ld-elf2flt.c b/ld-elf2flt.c
-index 7cb02d5..1a503dd 100644
+index 7cb02d5..75ee1bb 100644
--- a/ld-elf2flt.c
+++ b/ld-elf2flt.c
-@@ -324,6 +324,22 @@ static int do_final_link(void)
+@@ -324,6 +324,14 @@ static int do_final_link(void)
append_option(&other_options, concat(got_offset, "=", buf, NULL));
}
-+ if (streq(TARGET_CPU, "riscv64")) {
-+ /*
-+ * The .got section must come before the .got.plt section
-+ * (gcc/ld bug ?).
-+ */
-+ append_sed(&sed, "(.got.plt)", "(.got.tmp)");
-+ append_sed(&sed, "(.got.plt)", "(.got)");
-+ append_sed(&sed, "(.got.tmp)", "(.got.plt)");
-+
-+ /* The global pointer symbol is defined after the GOT. */
++ /* riscv adds a global pointer symbol to the linker file with the
++ "RISCV_GP:" prefix. Remove the prefix for riscv64 architecture and
++ the entire line for other architectures. */
++ if (streq(TARGET_CPU, "riscv64"))
+ append_sed(&sed, "^RISCV_GP:", "");
-+ } else {
-+ /* Get rid of the global pointer definition. */
++ else
+ append_sed(&sed, "^RISCV_GP:", NULL);
-+ }
+
/* Locate the default linker script, if we don't have one provided. */
if (!linker_script)
linker_script = concat(ldscriptpath, "/elf2flt.ld", NULL);
--
-2.35.1
+2.36.1
--
2.36.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Buildroot] [PATCH v2 02/11] package: elf2flt: Update RISC-V 64-bits support
2022-05-30 3:38 ` [Buildroot] [PATCH v2 02/11] package: elf2flt: Update RISC-V 64-bits support Damien Le Moal via buildroot
@ 2022-05-30 19:06 ` Thomas Petazzoni via buildroot
2022-07-25 14:44 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 23+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-05-30 19:06 UTC (permalink / raw)
To: Damien Le Moal via buildroot
Cc: Niklas Cassel, Damien Le Moal, Alistair Francis, Yann E . MORIN
On Mon, 30 May 2022 12:38:27 +0900
Damien Le Moal via buildroot <buildroot@buildroot.org> wrote:
> From: Damien Le Moal <damien.lemoal@wdc.com>
>
> Remove the old elf2flt 0002-elf2flt-add-riscv-64-bits-support.patch
> patch file for riscv64 architecture and replace it with 3 patches:
>
> (1) The first patch fixes the data section alignment
> (2) The second patch fixes a bug with the handling of the eh_frame
> section causing text and data section overlap problems.
> (3) The third patch adds a simpler riscv64 flat bin relocation support.
>
> These 3 patches are submitted to the upstream elf2flt project as pull
> request #22:
>
> https://github.com/uclinux-dev/elf2flt/pull/22
>
> Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
> Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
> ---
> ...tate-32-byte-alignment-for-.data-sec.patch | 81 +++++++++++++++++++
> ...f2flt-fix-.eh_frame-section-handling.patch | 73 +++++++++++++++++
> ...4-elf2flt-add-riscv-64-bits-support.patch} | 80 +++++++-----------
> 3 files changed, 181 insertions(+), 53 deletions(-)
> create mode 100644 package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch
> create mode 100644 package/elf2flt/0003-elf2flt-fix-.eh_frame-section-handling.patch
> rename package/elf2flt/{0002-elf2flt-add-riscv-64-bits-support.patch => 0004-elf2flt-add-riscv-64-bits-support.patch} (52%)
Applied to next, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Buildroot] [PATCH v2 02/11] package: elf2flt: Update RISC-V 64-bits support
2022-05-30 3:38 ` [Buildroot] [PATCH v2 02/11] package: elf2flt: Update RISC-V 64-bits support Damien Le Moal via buildroot
2022-05-30 19:06 ` Thomas Petazzoni via buildroot
@ 2022-07-25 14:44 ` Thomas Petazzoni via buildroot
2022-07-26 3:41 ` Damien Le Moal via buildroot
2022-08-06 20:47 ` Thomas Petazzoni via buildroot
1 sibling, 2 replies; 23+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-07-25 14:44 UTC (permalink / raw)
To: Damien Le Moal via buildroot
Cc: Niklas Cassel, Damien Le Moal, Alistair Francis, Yann E . MORIN
Hello Damien, Hello Niklas,
On Mon, 30 May 2022 12:38:27 +0900
Damien Le Moal via buildroot <buildroot@buildroot.org> wrote:
> From: Damien Le Moal <damien.lemoal@wdc.com>
>
> Remove the old elf2flt 0002-elf2flt-add-riscv-64-bits-support.patch
> patch file for riscv64 architecture and replace it with 3 patches:
>
> (1) The first patch fixes the data section alignment
> (2) The second patch fixes a bug with the handling of the eh_frame
> section causing text and data section overlap problems.
> (3) The third patch adds a simpler riscv64 flat bin relocation support.
>
> These 3 patches are submitted to the upstream elf2flt project as pull
> request #22:
>
> https://github.com/uclinux-dev/elf2flt/pull/22
We are seeing an issue with this patch applied: it segfaults when
linking binaries on the m68k architecture.
To be fully clear, when we use the current version of elf2flt in
Buildroot (2021.02) + patch 0001-elf2flt-handle-binutils-2.34.patch +
patch 0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch,
we have the following failure:
/home/thomas/buildroot/outputs/m68k/host/m68k-buildroot-uclinux-uclibc/bin/elf2flt: ERROR: text=0x7db78 overlaps data=0x6b940 ?
which already existed *prior* to applying your patch.
However, as soon as we add
0003-elf2flt-fix-.eh_frame-section-handling.patch into the patch series
applied to elf2flt, we get:
ld (ld-elf2flt): /home/thomas/buildroot/outputs/m68k/host/m68k-buildroot-uclinux-uclibc/bin/elf2flt terminated with signal 11 [Segmentation fault], core dumped
Our friend gdb gives us some hint on where the segfault occurs:
#0 0x000055ebfc7524e0 in add_com_to_bss (bss_len=19112, number_of_symbols=3869, symbol_table=0x55ebfd601d50) at elf2flt.c:273
273 if (strcmp("*COM*", symbol_table[i]->section->name) == 0) {
Of course, we're not sure if the error "ERROR: text=0x7db78 overlaps
data=0x6b940 ?" is fixed by your patch and a later problem causes the
segfault, or if your patch causes the segfault in the first place.
Please note that if we revert both
32f93b0ef2c602dfa1f5b243ba865d5b16e2fa33 and
65d78dcfeb8b2eafaebe2d0c3c8c42e7e85f46ac in Buildroot, we have a
working elf2flt for m68k.
Do you have any idea?
Thanks a lot!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Buildroot] [PATCH v2 02/11] package: elf2flt: Update RISC-V 64-bits support
2022-07-25 14:44 ` Thomas Petazzoni via buildroot
@ 2022-07-26 3:41 ` Damien Le Moal via buildroot
2022-07-26 9:30 ` Romain Naour
2022-08-06 20:47 ` Thomas Petazzoni via buildroot
1 sibling, 1 reply; 23+ messages in thread
From: Damien Le Moal via buildroot @ 2022-07-26 3:41 UTC (permalink / raw)
To: Thomas Petazzoni, Damien Le Moal via buildroot
Cc: Niklas Cassel, Alistair Francis, Geert Uytterhoeven,
Yann E . MORIN
On 7/25/22 23:44, Thomas Petazzoni wrote:
> Hello Damien, Hello Niklas,
+Geert
>
> On Mon, 30 May 2022 12:38:27 +0900
> Damien Le Moal via buildroot <buildroot@buildroot.org> wrote:
>
>> From: Damien Le Moal <damien.lemoal@wdc.com>
>>
>> Remove the old elf2flt 0002-elf2flt-add-riscv-64-bits-support.patch
>> patch file for riscv64 architecture and replace it with 3 patches:
>>
>> (1) The first patch fixes the data section alignment
>> (2) The second patch fixes a bug with the handling of the eh_frame
>> section causing text and data section overlap problems.
>> (3) The third patch adds a simpler riscv64 flat bin relocation support.
>>
>> These 3 patches are submitted to the upstream elf2flt project as pull
>> request #22:
>>
>> https://github.com/uclinux-dev/elf2flt/pull/22
>
> We are seeing an issue with this patch applied: it segfaults when
> linking binaries on the m68k architecture.
>
> To be fully clear, when we use the current version of elf2flt in
> Buildroot (2021.02) + patch 0001-elf2flt-handle-binutils-2.34.patch +
> patch 0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch,
> we have the following failure:
>
> /home/thomas/buildroot/outputs/m68k/host/m68k-buildroot-uclinux-uclibc/bin/elf2flt: ERROR: text=0x7db78 overlaps data=0x6b940 ?
>
> which already existed *prior* to applying your patch.
>
> However, as soon as we add
> 0003-elf2flt-fix-.eh_frame-section-handling.patch into the patch series
> applied to elf2flt, we get:
>
> ld (ld-elf2flt): /home/thomas/buildroot/outputs/m68k/host/m68k-buildroot-uclinux-uclibc/bin/elf2flt terminated with signal 11 [Segmentation fault], core dumped
>
> Our friend gdb gives us some hint on where the segfault occurs:
>
> #0 0x000055ebfc7524e0 in add_com_to_bss (bss_len=19112, number_of_symbols=3869, symbol_table=0x55ebfd601d50) at elf2flt.c:273
> 273 if (strcmp("*COM*", symbol_table[i]->section->name) == 0) {
>
> Of course, we're not sure if the error "ERROR: text=0x7db78 overlaps
> data=0x6b940 ?" is fixed by your patch and a later problem causes the
> segfault, or if your patch causes the segfault in the first place.
>
> Please note that if we revert both
> 32f93b0ef2c602dfa1f5b243ba865d5b16e2fa33 and
> 65d78dcfeb8b2eafaebe2d0c3c8c42e7e85f46ac in Buildroot, we have a
> working elf2flt for m68k.
>
> Do you have any idea?
>
> Thanks a lot!
>
> Thomas
--
Damien Le Moal
Western Digital Research
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Buildroot] [PATCH v2 02/11] package: elf2flt: Update RISC-V 64-bits support
2022-07-26 3:41 ` Damien Le Moal via buildroot
@ 2022-07-26 9:30 ` Romain Naour
0 siblings, 0 replies; 23+ messages in thread
From: Romain Naour @ 2022-07-26 9:30 UTC (permalink / raw)
To: Damien Le Moal, Thomas Petazzoni, Damien Le Moal via buildroot
Cc: Niklas Cassel, Alistair Francis, Geert Uytterhoeven,
Yann E . MORIN
Hello,
Le 26/07/2022 à 05:41, Damien Le Moal via buildroot a écrit :
> On 7/25/22 23:44, Thomas Petazzoni wrote:
>> Hello Damien, Hello Niklas,
>
> +Geert
>
>>
>> On Mon, 30 May 2022 12:38:27 +0900
>> Damien Le Moal via buildroot <buildroot@buildroot.org> wrote:
>>
>>> From: Damien Le Moal <damien.lemoal@wdc.com>
>>>
>>> Remove the old elf2flt 0002-elf2flt-add-riscv-64-bits-support.patch
>>> patch file for riscv64 architecture and replace it with 3 patches:
>>>
>>> (1) The first patch fixes the data section alignment
>>> (2) The second patch fixes a bug with the handling of the eh_frame
>>> section causing text and data section overlap problems.
>>> (3) The third patch adds a simpler riscv64 flat bin relocation support.
>>>
>>> These 3 patches are submitted to the upstream elf2flt project as pull
>>> request #22:
>>>
>>> https://github.com/uclinux-dev/elf2flt/pull/22
>>
>> We are seeing an issue with this patch applied: it segfaults when
>> linking binaries on the m68k architecture.
>>
>> To be fully clear, when we use the current version of elf2flt in
>> Buildroot (2021.02) + patch 0001-elf2flt-handle-binutils-2.34.patch +
>> patch 0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch,
>> we have the following failure:
>>
>> /home/thomas/buildroot/outputs/m68k/host/m68k-buildroot-uclinux-uclibc/bin/elf2flt: ERROR: text=0x7db78 overlaps data=0x6b940 ?
>>
>> which already existed *prior* to applying your patch.
>>
>> However, as soon as we add
>> 0003-elf2flt-fix-.eh_frame-section-handling.patch into the patch series
>> applied to elf2flt, we get:
>>
>> ld (ld-elf2flt): /home/thomas/buildroot/outputs/m68k/host/m68k-buildroot-uclinux-uclibc/bin/elf2flt terminated with signal 11 [Segmentation fault], core dumped
>>
>> Our friend gdb gives us some hint on where the segfault occurs:
>>
>> #0 0x000055ebfc7524e0 in add_com_to_bss (bss_len=19112, number_of_symbols=3869, symbol_table=0x55ebfd601d50) at elf2flt.c:273
>> 273 if (strcmp("*COM*", symbol_table[i]->section->name) == 0) {
>>
>> Of course, we're not sure if the error "ERROR: text=0x7db78 overlaps
>> data=0x6b940 ?" is fixed by your patch and a later problem causes the
>> segfault, or if your patch causes the segfault in the first place.
>>
>> Please note that if we revert both
>> 32f93b0ef2c602dfa1f5b243ba865d5b16e2fa33 and
>> 65d78dcfeb8b2eafaebe2d0c3c8c42e7e85f46ac in Buildroot, we have a
>> working elf2flt for m68k.
>>
>> Do you have any idea?
I spent some time on the m68k issue and I'm agree with your analysis from your
patch 0003-elf2flt-fix-.eh_frame-section-handling.patch [1], the commit [2]
introduce a problem on m68k and riscv64 with the section scanning loop of
elf2flt main().
"The way that elf2flt is written, we cannot append to the text output
section after an input section has been added to the data output
section."
With your patch 0003 reverted and additional debug print shows that we have a
section with the same flags set on m68k as for ARM .ARM.exidx section: 0x12f
output/host/m68k-buildroot-uclinux-uclibc/bin/elf2flt: ERROR: text=0x7db78
overlaps data=0x6b940 ?
TEXT (flags 11f)-> vma=0xffffffff len=0x0
DATA (flags 11f)-> vma=0xffffffff len=0x0
TEXT (flags 127)-> vma=0x0 len=0x6b93c
DATA (flags 127)-> vma=0xffffffff len=0x0
TEXT (flags 123)-> vma=0x0 len=0x6b93c
DATA (flags 123)-> vma=0x6b940 len=0x12160
TEXT (flags 12f)-> vma=0x0 len=0x6b93c <<< was ARM.exidx
DATA (flags 12f)-> vma=0x6b940 len=0x12160
TEXT (flags 1)-> vma=0x0 len=0x7db78 << bss
DATA (flags 1)-> vma=0x6b940 len=0x12160
TEXT -> vma=0x0 len=0x7db78
DATA -> vma=0x6b940 len=0x12160
Since commits [2] and [3] are related to ARM.exidx and we have the "same"
section (same flags 0x12f) on m68k, I'm wondering if placing read-only
relocation data section in the .text flat output section is really supported for
m68k or should be ARM specific?
But from Binutils maintainer feedback [4] it seems the correct thing to do.
Based on what the maintainer said, I'm not sure if your fix 0003 is correct
since it allows putting some read-only relocation data section in the data
output section.
I hope it help...
[1]
https://git.buildroot.net/buildroot/commit/?id=32f93b0ef2c602dfa1f5b243ba865d5b16e2fa33
[2]
https://github.com/uclinux-dev/elf2flt/commit/ba379d08bb78c9300e84351c11080c26ddcc36b3
[3]
https://github.com/uclinux-dev/elf2flt/commit/73325b7f209e0f68887333385184af275531427d
[4] https://sourceware.org/legacy-ml/binutils/2019-10/msg00132.html
Best regards,
Romain
>>
>> Thanks a lot!
>>
>> Thomas
>
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Buildroot] [PATCH v2 02/11] package: elf2flt: Update RISC-V 64-bits support
2022-07-25 14:44 ` Thomas Petazzoni via buildroot
2022-07-26 3:41 ` Damien Le Moal via buildroot
@ 2022-08-06 20:47 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 23+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-08-06 20:47 UTC (permalink / raw)
To: Thomas Petazzoni via buildroot
Cc: Niklas Cassel, Damien Le Moal, Alistair Francis, Yann E . MORIN,
Thomas Petazzoni
Hello Damien, Hello Niklas,
Are there some updates on fixing the elf2flt segfault? It breaks some
of our defconfigs for other CPU architectures, so it cannot stay in
this situation :-/
Thanks for your contribution!
Thomas
On Mon, 25 Jul 2022 16:44:25 +0200
Thomas Petazzoni via buildroot <buildroot@buildroot.org> wrote:
> Hello Damien, Hello Niklas,
>
> On Mon, 30 May 2022 12:38:27 +0900
> Damien Le Moal via buildroot <buildroot@buildroot.org> wrote:
>
> > From: Damien Le Moal <damien.lemoal@wdc.com>
> >
> > Remove the old elf2flt 0002-elf2flt-add-riscv-64-bits-support.patch
> > patch file for riscv64 architecture and replace it with 3 patches:
> >
> > (1) The first patch fixes the data section alignment
> > (2) The second patch fixes a bug with the handling of the eh_frame
> > section causing text and data section overlap problems.
> > (3) The third patch adds a simpler riscv64 flat bin relocation support.
> >
> > These 3 patches are submitted to the upstream elf2flt project as pull
> > request #22:
> >
> > https://github.com/uclinux-dev/elf2flt/pull/22
>
> We are seeing an issue with this patch applied: it segfaults when
> linking binaries on the m68k architecture.
>
> To be fully clear, when we use the current version of elf2flt in
> Buildroot (2021.02) + patch 0001-elf2flt-handle-binutils-2.34.patch +
> patch 0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch,
> we have the following failure:
>
> /home/thomas/buildroot/outputs/m68k/host/m68k-buildroot-uclinux-uclibc/bin/elf2flt: ERROR: text=0x7db78 overlaps data=0x6b940 ?
>
> which already existed *prior* to applying your patch.
>
> However, as soon as we add
> 0003-elf2flt-fix-.eh_frame-section-handling.patch into the patch series
> applied to elf2flt, we get:
>
> ld (ld-elf2flt): /home/thomas/buildroot/outputs/m68k/host/m68k-buildroot-uclinux-uclibc/bin/elf2flt terminated with signal 11 [Segmentation fault], core dumped
>
> Our friend gdb gives us some hint on where the segfault occurs:
>
> #0 0x000055ebfc7524e0 in add_com_to_bss (bss_len=19112, number_of_symbols=3869, symbol_table=0x55ebfd601d50) at elf2flt.c:273
> 273 if (strcmp("*COM*", symbol_table[i]->section->name) == 0) {
>
> Of course, we're not sure if the error "ERROR: text=0x7db78 overlaps
> data=0x6b940 ?" is fixed by your patch and a later problem causes the
> segfault, or if your patch causes the segfault in the first place.
>
> Please note that if we revert both
> 32f93b0ef2c602dfa1f5b243ba865d5b16e2fa33 and
> 65d78dcfeb8b2eafaebe2d0c3c8c42e7e85f46ac in Buildroot, we have a
> working elf2flt for m68k.
>
> Do you have any idea?
>
> Thanks a lot!
>
> Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH v2 03/11] board: Add common Linux kernel support for RISCV NOMMU builds
2022-05-30 3:38 [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Damien Le Moal via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 01/11] package: elf2flt: fix config menu entry description Damien Le Moal via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 02/11] package: elf2flt: Update RISC-V 64-bits support Damien Le Moal via buildroot
@ 2022-05-30 3:38 ` Damien Le Moal via buildroot
2022-05-30 19:17 ` Thomas Petazzoni via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 04/11] configs/qemu_riscv64_nommu_virt_defconfig: new defconfig Damien Le Moal via buildroot
` (8 subsequent siblings)
11 siblings, 1 reply; 23+ messages in thread
From: Damien Le Moal via buildroot @ 2022-05-30 3:38 UTC (permalink / raw)
To: buildroot, Thomas Petazzoni
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN
Add the board/riscv/nommu directory to add Linux kernel patches used for
all RISC-V NOMMU builds (QEMU and Canaan Kendryte K210 SoC based
boards).
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
...ot-stop-relocating-GOT-entries-prema.patch | 110 ++++++++++++++++++
board/riscv/nommu/readme.txt | 3 +
2 files changed, 113 insertions(+)
create mode 100644 board/riscv/nommu/kernel_patches/0001-binfmt_flat-do-not-stop-relocating-GOT-entries-prema.patch
create mode 100644 board/riscv/nommu/readme.txt
diff --git a/board/riscv/nommu/kernel_patches/0001-binfmt_flat-do-not-stop-relocating-GOT-entries-prema.patch b/board/riscv/nommu/kernel_patches/0001-binfmt_flat-do-not-stop-relocating-GOT-entries-prema.patch
new file mode 100644
index 0000000000..e5513b729b
--- /dev/null
+++ b/board/riscv/nommu/kernel_patches/0001-binfmt_flat-do-not-stop-relocating-GOT-entries-prema.patch
@@ -0,0 +1,110 @@
+From 6045ab5fea4c849153ebeb0acb532da5f29d69c4 Mon Sep 17 00:00:00 2001
+From: Niklas Cassel <niklas.cassel@wdc.com>
+Date: Thu, 14 Apr 2022 11:10:18 +0200
+Subject: binfmt_flat: do not stop relocating GOT entries prematurely on riscv
+
+Upstream commit 6045ab5fea4c849153ebeb0acb532da5f29d69c4.
+
+bFLT binaries are usually created using elf2flt.
+
+The linker script used by elf2flt has defined the .data section like the
+following for the last 19 years:
+
+.data : {
+ _sdata = . ;
+ __data_start = . ;
+ data_start = . ;
+ *(.got.plt)
+ *(.got)
+ FILL(0) ;
+ . = ALIGN(0x20) ;
+ LONG(-1)
+ . = ALIGN(0x20) ;
+ ...
+}
+
+It places the .got.plt input section before the .got input section.
+The same is true for the default linker script (ld --verbose) on most
+architectures except x86/x86-64.
+
+The binfmt_flat loader should relocate all GOT entries until it encounters
+a -1 (the LONG(-1) in the linker script).
+
+The problem is that the .got.plt input section starts with a GOTPLT header
+(which has size 16 bytes on elf64-riscv and 8 bytes on elf32-riscv), where
+the first word is set to -1. See the binutils implementation for riscv [1].
+
+This causes the binfmt_flat loader to stop relocating GOT entries
+prematurely and thus causes the application to crash when running.
+
+Fix this by skipping the whole GOTPLT header, since the whole GOTPLT header
+is reserved for the dynamic linker.
+
+The GOTPLT header will only be skipped for bFLT binaries with flag
+FLAT_FLAG_GOTPIC set. This flag is unconditionally set by elf2flt if the
+supplied ELF binary has the symbol _GLOBAL_OFFSET_TABLE_ defined.
+ELF binaries without a .got input section should thus remain unaffected.
+
+Tested on RISC-V Canaan Kendryte K210 and RISC-V QEMU nommu_virt_defconfig.
+
+[1] https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=bfd/elfnn-riscv.c;hb=binutils-2_38#l3275
+
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
+Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
+Link: https://lore.kernel.org/r/20220414091018.896737-1-niklas.cassel@wdc.com
+Fixed-by: kernel test robot <lkp@intel.com>
+Link: https://lore.kernel.org/lkml/202204182333.OIUOotK8-lkp@intel.com
+Signed-off-by: Kees Cook <keescook@chromium.org>
+---
+ fs/binfmt_flat.c | 27 ++++++++++++++++++++++++++-
+ 1 file changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
+index 6268981500112..dca0b6875f9c3 100644
+--- a/fs/binfmt_flat.c
++++ b/fs/binfmt_flat.c
+@@ -440,6 +440,30 @@ static void old_reloc(unsigned long rl)
+
+ /****************************************************************************/
+
++static inline u32 __user *skip_got_header(u32 __user *rp)
++{
++ if (IS_ENABLED(CONFIG_RISCV)) {
++ /*
++ * RISC-V has a 16 byte GOT PLT header for elf64-riscv
++ * and 8 byte GOT PLT header for elf32-riscv.
++ * Skip the whole GOT PLT header, since it is reserved
++ * for the dynamic linker (ld.so).
++ */
++ u32 rp_val0, rp_val1;
++
++ if (get_user(rp_val0, rp))
++ return rp;
++ if (get_user(rp_val1, rp + 1))
++ return rp;
++
++ if (rp_val0 == 0xffffffff && rp_val1 == 0xffffffff)
++ rp += 4;
++ else if (rp_val0 == 0xffffffff)
++ rp += 2;
++ }
++ return rp;
++}
++
+ static int load_flat_file(struct linux_binprm *bprm,
+ struct lib_info *libinfo, int id, unsigned long *extra_stack)
+ {
+@@ -789,7 +813,8 @@ static int load_flat_file(struct linux_binprm *bprm,
+ * image.
+ */
+ if (flags & FLAT_FLAG_GOTPIC) {
+- for (rp = (u32 __user *)datapos; ; rp++) {
++ rp = skip_got_header((u32 __user *) datapos);
++ for (; ; rp++) {
+ u32 addr, rp_val;
+ if (get_user(rp_val, rp))
+ return -EFAULT;
+--
+cgit
+
diff --git a/board/riscv/nommu/readme.txt b/board/riscv/nommu/readme.txt
new file mode 100644
index 0000000000..ea754c9920
--- /dev/null
+++ b/board/riscv/nommu/readme.txt
@@ -0,0 +1,3 @@
+RISC-V NOMMU Common Support
+
+This directory provides Linux kernel patches common to all RISC-V NO-MMU builds.
--
2.36.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Buildroot] [PATCH v2 03/11] board: Add common Linux kernel support for RISCV NOMMU builds
2022-05-30 3:38 ` [Buildroot] [PATCH v2 03/11] board: Add common Linux kernel support for RISCV NOMMU builds Damien Le Moal via buildroot
@ 2022-05-30 19:17 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-05-30 19:17 UTC (permalink / raw)
To: Damien Le Moal via buildroot
Cc: Niklas Cassel, Damien Le Moal, Alistair Francis, Yann E . MORIN
Hello Damien,
On Mon, 30 May 2022 12:38:28 +0900
Damien Le Moal via buildroot <buildroot@buildroot.org> wrote:
> Add the board/riscv/nommu directory to add Linux kernel patches used for
> all RISC-V NOMMU builds (QEMU and Canaan Kendryte K210 SoC based
> boards).
>
> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Thanks, I have applied to our next branch, but after moving the patch in
board/riscv/nommu/patches/linux/5.18/. This way, we can use
BR2_GLOBAL_PATCH_DIR on board/riscv/nommu/patches/, and also ensure
that the patch gets only applied to version 5.18 of the kernel.
Thanks a lot!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH v2 04/11] configs/qemu_riscv64_nommu_virt_defconfig: new defconfig
2022-05-30 3:38 [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Damien Le Moal via buildroot
` (2 preceding siblings ...)
2022-05-30 3:38 ` [Buildroot] [PATCH v2 03/11] board: Add common Linux kernel support for RISCV NOMMU builds Damien Le Moal via buildroot
@ 2022-05-30 3:38 ` Damien Le Moal via buildroot
2022-05-30 19:18 ` Thomas Petazzoni via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 05/11] package: python-kflash: Kendryte K210 UART ISP Utility Damien Le Moal via buildroot
` (7 subsequent siblings)
11 siblings, 1 reply; 23+ messages in thread
From: Damien Le Moal via buildroot @ 2022-05-30 3:38 UTC (permalink / raw)
To: buildroot, Thomas Petazzoni
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN
From: Niklas Cassel <niklas.cassel@wdc.com>
Add RISC-V 64-bit nommu defconfig for QEMU virt machine with MMU
disabled.
Unlike qemu_riscv64_virt, qemu_riscv64_nommu_virt does not use OpenSBI,
since the kernel is running in machine mode (M-mode).
After the build is complete, you can start QEMU using the launcher
script:
$ output/images/start-qemu.sh
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
board/qemu/riscv64-virt/readme.txt | 2 ++
configs/qemu_riscv64_nommu_virt_defconfig | 35 +++++++++++++++++++++++
2 files changed, 37 insertions(+)
create mode 100644 configs/qemu_riscv64_nommu_virt_defconfig
diff --git a/board/qemu/riscv64-virt/readme.txt b/board/qemu/riscv64-virt/readme.txt
index 747a9ea674..9e4cfc8c55 100644
--- a/board/qemu/riscv64-virt/readme.txt
+++ b/board/qemu/riscv64-virt/readme.txt
@@ -2,4 +2,6 @@ Run Linux in emulation with:
qemu-system-riscv64 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig
+ qemu-system-riscv64 -M virt -bios none -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -nographic -cpu rv64,mmu=off # qemu_riscv64_nommu_virt_defconfig
+
The login prompt will appear in the terminal that started Qemu.
diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig
new file mode 100644
index 0000000000..2bb6993fbf
--- /dev/null
+++ b/configs/qemu_riscv64_nommu_virt_defconfig
@@ -0,0 +1,35 @@
+# Architecture
+BR2_riscv=y
+BR2_RISCV_64=y
+
+# Toolchain
+BR2_PACKAGE_HOST_ELF2FLT=y
+# BR2_USE_MMU is not set
+
+# Busybox with hush
+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
+
+# System
+BR2_TARGET_GENERIC_GETTY=y
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+
+# Image
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_PATCH="board/riscv/nommu/kernel_patches"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.18"
+BR2_LINUX_KERNEL_DEFCONFIG="nommu_virt"
+BR2_LINUX_KERNEL_IMAGE=y
+
+# Disable network scripts
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+
+# host-qemu for gitlab testing
+BR2_PACKAGE_HOST_QEMU=y
+BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y
--
2.36.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Buildroot] [PATCH v2 04/11] configs/qemu_riscv64_nommu_virt_defconfig: new defconfig
2022-05-30 3:38 ` [Buildroot] [PATCH v2 04/11] configs/qemu_riscv64_nommu_virt_defconfig: new defconfig Damien Le Moal via buildroot
@ 2022-05-30 19:18 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-05-30 19:18 UTC (permalink / raw)
To: Damien Le Moal via buildroot
Cc: Niklas Cassel, Damien Le Moal, Alistair Francis, Yann E . MORIN
Hello Damien, Niklas,
On Mon, 30 May 2022 12:38:29 +0900
Damien Le Moal via buildroot <buildroot@buildroot.org> wrote:
> From: Niklas Cassel <niklas.cassel@wdc.com>
>
> Add RISC-V 64-bit nommu defconfig for QEMU virt machine with MMU
> disabled.
>
> Unlike qemu_riscv64_virt, qemu_riscv64_nommu_virt does not use OpenSBI,
> since the kernel is running in machine mode (M-mode).
>
> After the build is complete, you can start QEMU using the launcher
> script:
> $ output/images/start-qemu.sh
>
> Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
> ---
> board/qemu/riscv64-virt/readme.txt | 2 ++
> configs/qemu_riscv64_nommu_virt_defconfig | 35 +++++++++++++++++++++++
> 2 files changed, 37 insertions(+)
> create mode 100644 configs/qemu_riscv64_nommu_virt_defconfig
I have applied to our next branch, after changing two things:
(1) Adding an entry in the DEVELOPERS file for the new defconfig, so
that Niklas will receive notifications from our Gitlab CI if the
defconfig fails to build now or in the future.
(2) Changed to use BR2_GLOBAL_PATCH_DIR to point to
board/riscv/nommu/patches to get the Linux kernel patch that is
currently needed.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH v2 05/11] package: python-kflash: Kendryte K210 UART ISP Utility
2022-05-30 3:38 [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Damien Le Moal via buildroot
` (3 preceding siblings ...)
2022-05-30 3:38 ` [Buildroot] [PATCH v2 04/11] configs/qemu_riscv64_nommu_virt_defconfig: new defconfig Damien Le Moal via buildroot
@ 2022-05-30 3:38 ` Damien Le Moal via buildroot
2022-05-30 19:31 ` Thomas Petazzoni via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 06/11] board: Add common support for Canaan K210 SoC-based boards Damien Le Moal via buildroot
` (6 subsequent siblings)
11 siblings, 1 reply; 23+ messages in thread
From: Damien Le Moal via buildroot @ 2022-05-30 3:38 UTC (permalink / raw)
To: buildroot, Thomas Petazzoni
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN
Add the kflash Kendryte K210 UART ISP Utility as a host package to allow
users to program their board boot ROM or SRAM with built images.
The kflash utility is available through the pypi.org python package
index. The project is homepage is: https://github.com/vowstar/kflash.py.
kflash depends on the python-serial and python-pyelftools packages.
These packages are modified to add the host package definition.
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
DEVELOPERS | 3 +++
package/Config.in.host | 3 +++
package/python-kflash/Config.in.host | 9 +++++++++
package/python-kflash/python-kflash.hash | 5 +++++
package/python-kflash/python-kflash.mk | 15 +++++++++++++++
package/python-pyelftools/Config.in.host | 7 +++++++
package/python-serial/Config.in.host | 6 ++++++
package/python-serial/python-serial.mk | 1 +
8 files changed, 49 insertions(+)
create mode 100644 package/python-kflash/Config.in.host
create mode 100644 package/python-kflash/python-kflash.hash
create mode 100644 package/python-kflash/python-kflash.mk
create mode 100644 package/python-pyelftools/Config.in.host
create mode 100644 package/python-serial/Config.in.host
diff --git a/DEVELOPERS b/DEVELOPERS
index 71cc3da6d7..14c6f02cce 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -627,6 +627,9 @@ N: Damien Lanson <damien@kal-host.com>
F: package/libvdpau/
F: package/log4cpp/
+N: Damien Le Moal <damien.lemoal@wdc.com>
+F: package/python-kflash/
+
N: Daniel Nicoletti <dantti12@gmail.com>
F: package/cutelyst/
diff --git a/package/Config.in.host b/package/Config.in.host
index cd1c34b5a3..6c9fd7c493 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -72,7 +72,10 @@ menu "Host utilities"
source "package/pwgen/Config.in.host"
source "package/python-cython/Config.in.host"
source "package/python-greenlet/Config.in.host"
+ source "package/python-kflash/Config.in.host"
source "package/python-lxml/Config.in.host"
+ source "package/python-pyelftools/Config.in.host"
+ source "package/python-serial/Config.in.host"
source "package/python-six/Config.in.host"
source "package/python-xlrd/Config.in.host"
source "package/python3/Config.in.host"
diff --git a/package/python-kflash/Config.in.host b/package/python-kflash/Config.in.host
new file mode 100644
index 0000000000..a16857078f
--- /dev/null
+++ b/package/python-kflash/Config.in.host
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_HOST_PYTHON_KFLASH
+ bool "host python-kflash"
+ depends on BR2_RISCV_64 && !BR2_USE_MMU
+ select BR2_PACKAGE_HOST_PYTHON_PYELFTOOLS
+ select BR2_PACKAGE_HOST_PYTHON_SERIAL
+ help
+ Kendryte UART ISP Utility - programming code to k210.
+
+ https://github.com/vowstar/kflash.py
diff --git a/package/python-kflash/python-kflash.hash b/package/python-kflash/python-kflash.hash
new file mode 100644
index 0000000000..722c4e879b
--- /dev/null
+++ b/package/python-kflash/python-kflash.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/kflash/json
+md5 85549bcc1faa0f2cd5ebe3b04759e7fa kflash-1.1.5.tar.gz
+sha256 40a0976b52942c7a3bdfa2d9e2bdc8d7526cf6deb0759c8384281240c8fb404e kflash-1.1.5.tar.gz
+# Locally computed sha256 checksums
+sha256 c48133d7a08d743c2c01c6190fc1860f7d73777afa2199ed8d0a035b754d8bf9 LICENSE
diff --git a/package/python-kflash/python-kflash.mk b/package/python-kflash/python-kflash.mk
new file mode 100644
index 0000000000..adbf6b30b0
--- /dev/null
+++ b/package/python-kflash/python-kflash.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# python-kflash
+#
+################################################################################
+
+PYTHON_KFLASH_VERSION = 1.1.5
+PYTHON_KFLASH_SOURCE = kflash-$(PYTHON_KFLASH_VERSION).tar.gz
+PYTHON_KFLASH_SITE = https://files.pythonhosted.org/packages/c4/b3/1c25a92922bfd3dbc05d972352c071167cad035c615f6f068f75c2f0fd01
+PYTHON_KFLASH_SETUP_TYPE = setuptools
+PYTHON_KFLASH_LICENSE = MIT
+PYTHON_KFLASH_LICENSE_FILES = LICENSE
+HOST_PYTHON_KFLASH_DEPENDENCIES = host-python-pyelftools host-python-serial
+
+$(eval $(host-python-package))
diff --git a/package/python-pyelftools/Config.in.host b/package/python-pyelftools/Config.in.host
new file mode 100644
index 0000000000..8f5829a964
--- /dev/null
+++ b/package/python-pyelftools/Config.in.host
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_HOST_PYTHON_PYELFTOOLS
+ bool "host python-pyelftools"
+ help
+ Pyelftools is a Python library for parsing and analyzing ELF
+ files and DWARF debug information.
+
+ https://github.com/eliben/pyelftools
diff --git a/package/python-serial/Config.in.host b/package/python-serial/Config.in.host
new file mode 100644
index 0000000000..3c071575d7
--- /dev/null
+++ b/package/python-serial/Config.in.host
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_PYTHON_SERIAL
+ bool "host python-serial"
+ help
+ python-serial is a Python library to access serial ports.
+
+ https://github.com/pyserial/pyserial
diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk
index 249ea9d5a3..87cd9392f1 100644
--- a/package/python-serial/python-serial.mk
+++ b/package/python-serial/python-serial.mk
@@ -12,3 +12,4 @@ PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt
PYTHON_SERIAL_SETUP_TYPE = setuptools
$(eval $(python-package))
+$(eval $(host-python-package))
--
2.36.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Buildroot] [PATCH v2 05/11] package: python-kflash: Kendryte K210 UART ISP Utility
2022-05-30 3:38 ` [Buildroot] [PATCH v2 05/11] package: python-kflash: Kendryte K210 UART ISP Utility Damien Le Moal via buildroot
@ 2022-05-30 19:31 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-05-30 19:31 UTC (permalink / raw)
To: Damien Le Moal via buildroot
Cc: Niklas Cassel, Damien Le Moal, Alistair Francis, Yann E . MORIN
Hello Damien,
On Mon, 30 May 2022 12:38:30 +0900
Damien Le Moal via buildroot <buildroot@buildroot.org> wrote:
> Add the kflash Kendryte K210 UART ISP Utility as a host package to allow
> users to program their board boot ROM or SRAM with built images.
>
> The kflash utility is available through the pypi.org python package
> index. The project is homepage is: https://github.com/vowstar/kflash.py.
>
> kflash depends on the python-serial and python-pyelftools packages.
> These packages are modified to add the host package definition.
>
> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
> ---
> DEVELOPERS | 3 +++
> package/Config.in.host | 3 +++
> package/python-kflash/Config.in.host | 9 +++++++++
> package/python-kflash/python-kflash.hash | 5 +++++
> package/python-kflash/python-kflash.mk | 15 +++++++++++++++
> package/python-pyelftools/Config.in.host | 7 +++++++
> package/python-serial/Config.in.host | 6 ++++++
> package/python-serial/python-serial.mk | 1 +
> 8 files changed, 49 insertions(+)
> create mode 100644 package/python-kflash/Config.in.host
> create mode 100644 package/python-kflash/python-kflash.hash
> create mode 100644 package/python-kflash/python-kflash.mk
> create mode 100644 package/python-pyelftools/Config.in.host
> create mode 100644 package/python-serial/Config.in.host
I have applied to next, after doing some changes:
- I have split into a separate patch the addition of the host variant
of python-serial
- I have dropped the addition of package/python-serial/Config.in.host
and package/python-pyelftools/Config.in.host, as these were not
needed. We only add Config.in.host files for host packages that are
directly "useful" to the user, not when they are just dependencies
of another package.
- I have fixed the commit title to match our coding style.
Thanks a lot!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH v2 06/11] board: Add common support for Canaan K210 SoC-based boards
2022-05-30 3:38 [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Damien Le Moal via buildroot
` (4 preceding siblings ...)
2022-05-30 3:38 ` [Buildroot] [PATCH v2 05/11] package: python-kflash: Kendryte K210 UART ISP Utility Damien Le Moal via buildroot
@ 2022-05-30 3:38 ` Damien Le Moal via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 07/11] board: Add Sipeed MAIX-Bit board support Damien Le Moal via buildroot
` (5 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Damien Le Moal via buildroot @ 2022-05-30 3:38 UTC (permalink / raw)
To: buildroot, Thomas Petazzoni
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN
The Linux environment for all boards using the Canaan Kendryte K210 SoC
can be built with the same process, using configurations that differ
only by the device tree used for the build. This patch add the
shared configurations, rootfs overlay and scripts used for all
K210-based boards.
Since the K210 SoC only has 8 MB of SRAM, a special busybox
configuration and rootfs overlay are added to save memory at runtime:
* For configurations using direct kernel boot (no boot loader), the
default busybox configuration busybox-minimal.config is modified
using the fragment file board/canaan/k210-soc/busybox-tiny.config.
This reduces the size of the busybox executable to save memory when
executing shell commands.
* Busybox init system is not used and a special init scripts is provided
using the rootfs_overlay root file system overlay. This init script
simply mounts devtmpfs, /proc and /sys, and exec an interactive shell
after printing a logo. This avoids (1) boot failures due to large
memory allocations by the regular busybox init system (these
allocations fail on the K210 for lack of enough memory) and avoids
(2) keeping the init process sleeping in the background (wasted
memory).
The board/canaan/k210-soc/busybox-tiny.config and the rootfs overlay
files in board/canaan/k210-soc/rootfs_overlay are used for all Canaan
K210 SoC based boards.
For board configurations booting using the U-Boot boot loader, a common
set of linux kernel configuration parameters is provided by the file
board/canaan/k210-soc/linux-sdcard.config. In addition, the post build
script board/canaan/k210-soc/post-build.sh file and U-Boot image
generation configuration file board/canaan/k210-soc/genimage.cfg are
provided. The post-build script creates a generic "k210.dtb" symlink to
the compiled device tree file for the target board. This symlink is used
by the genimage.cfg configuration, making this file common for all
boards.
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
DEVELOPERS | 1 +
board/canaan/k210-soc/busybox-tiny.config | 231 ++++++++++++++++++
board/canaan/k210-soc/genimage.cfg | 30 +++
board/canaan/k210-soc/linux-sdcard.config | 4 +
board/canaan/k210-soc/post-build.sh | 28 +++
board/canaan/k210-soc/rootfs_overlay/init | 1 +
.../canaan/k210-soc/rootfs_overlay/sbin/init | 41 ++++
board/canaan/k210-soc/uboot.config | 1 +
8 files changed, 337 insertions(+)
create mode 100644 board/canaan/k210-soc/busybox-tiny.config
create mode 100644 board/canaan/k210-soc/genimage.cfg
create mode 100644 board/canaan/k210-soc/linux-sdcard.config
create mode 100755 board/canaan/k210-soc/post-build.sh
create mode 120000 board/canaan/k210-soc/rootfs_overlay/init
create mode 100755 board/canaan/k210-soc/rootfs_overlay/sbin/init
create mode 100644 board/canaan/k210-soc/uboot.config
diff --git a/DEVELOPERS b/DEVELOPERS
index 14c6f02cce..93806b2c99 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -629,6 +629,7 @@ F: package/log4cpp/
N: Damien Le Moal <damien.lemoal@wdc.com>
F: package/python-kflash/
+F: board/canaan/
N: Daniel Nicoletti <dantti12@gmail.com>
F: package/cutelyst/
diff --git a/board/canaan/k210-soc/busybox-tiny.config b/board/canaan/k210-soc/busybox-tiny.config
new file mode 100644
index 0000000000..9db12b560a
--- /dev/null
+++ b/board/canaan/k210-soc/busybox-tiny.config
@@ -0,0 +1,231 @@
+#
+# Additional config changes for busybox-minimal.config
+# to reduce the size of the busybox executable.
+#
+
+#
+# Settings
+#
+# CONFIG_INCLUDE_SUSv2 is not set
+# CONFIG_LONG_OPTS is not set
+# CONFIG_LFS is not set
+# CONFIG_FEATURE_DEVPTS is not set
+# CONFIG_FEATURE_SYSLOG_INFO is not set
+# CONFIG_FEATURE_SYSLOG is not set
+
+#
+# Library Tuning
+#
+# CONFIG_FEATURE_RTMINMAX is not set
+# CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS is not set
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
+# CONFIG_FEATURE_EDITING_VI is not set
+# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+# CONFIG_FEATURE_REVERSE_SEARCH is not set
+# CONFIG_FEATURE_EDITING_WINCH is not set
+# CONFIG_FEATURE_HWIB is not set
+
+#
+# Archival Utilities
+#
+# CONFIG_ZCAT is not set
+# CONFIG_BZCAT is not set
+# CONFIG_LZCAT is not set
+# CONFIG_XZCAT is not set
+# CONFIG_UNLZOP is not set
+# CONFIG_LZOPCAT is not set
+
+#
+# Coreutils
+#
+# CONFIG_CKSUM is not set
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+# CONFIG_DU is not set
+# CONFIG_FACTOR is not set
+# CONFIG_FOLD is not set
+# CONFIG_HEAD is not set
+# CONFIG_INSTALL is not set
+# CONFIG_LINK is not set
+# CONFIG_LOGNAME is not set
+# CONFIG_MD5SUM is not set
+# CONFIG_SHA1SUM is not set
+# CONFIG_SHA256SUM is not set
+# CONFIG_SHA512SUM is not set
+# CONFIG_SHA3SUM is not set
+# CONFIG_MKFIFO is not set
+# CONFIG_NICE is not set
+# CONFIG_NL is not set
+# CONFIG_NOHUP is not set
+# CONFIG_OD is not set
+# CONFIG_PASTE is not set
+# CONFIG_SHRED is not set
+# CONFIG_SORT is not set
+# CONFIG_TAIL is not set
+# CONFIG_TEE is not set
+# CONFIG_TIMEOUT is not set
+# CONFIG_TR is not set
+# CONFIG_UNIQ is not set
+# CONFIG_UUDECODE is not set
+# CONFIG_BASE32 is not set
+# CONFIG_UUENCODE is not set
+# CONFIG_WC is not set
+# CONFIG_WHOAMI is not set
+# CONFIG_WHO is not set
+# CONFIG_W is not set
+# CONFIG_USERS is not set
+# CONFIG_YES is not set
+
+#
+# Common options
+#
+# CONFIG_FEATURE_VERBOSE is not set
+
+#
+# Debian Utilities
+#
+# CONFIG_RUN_PARTS is not set
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+# CONFIG_START_STOP_DAEMON is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
+# CONFIG_WHICH is not set
+
+#
+# klibc-utils
+#
+# CONFIG_NUKE is not set
+# CONFIG_RESUME is not set
+# CONFIG_RUN_INIT is not set
+
+#
+# Editors
+#
+# CONFIG_SED is not set
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
+CONFIG_FEATURE_VI_UNDO=y
+
+#
+# Finding Utilities
+#
+CONFIG_GREP=y
+# CONFIG_EGREP is not set
+# CONFIG_FGREP is not set
+# CONFIG_XARGS is not set
+
+#
+# Init Utilities
+#
+# CONFIG_HALT is not set
+# CONFIG_POWEROFF is not set
+# CONFIG_FEATURE_WAIT_FOR_INIT is not set
+# CONFIG_FEATURE_CALL_TELINIT is not set
+# CONFIG_INIT is not set
+# CONFIG_LINUXRC is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_CRYPT is not set
+# CONFIG_USE_BB_CRYPT_SHA is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_GETTY is not set
+# CONFIG_LOGIN is not set
+# CONFIG_PASSWD is not set
+
+#
+# Linux System Utilities
+#
+# CONFIG_FALLOCATE is not set
+# CONFIG_FREERAMDISK is not set
+# CONFIG_FSFREEZE is not set
+# CONFIG_GETOPT is not set
+# CONFIG_XXD is not set
+# CONFIG_MESG is not set
+# CONFIG_MKE2FS is not set
+# CONFIG_MKDOSFS is not set
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+# CONFIG_FEATURE_MOUNT_FSTAB is not set
+# CONFIG_FEATURE_MOUNT_OTHERTAB is not set
+# CONFIG_NOLOGIN is not set
+# CONFIG_LINUX32 is not set
+# CONFIG_LINUX64 is not set
+# CONFIG_SETPRIV is not set
+
+#
+# Common options for mount/umount
+#
+# CONFIG_FEATURE_MOUNT_LOOP is not set
+# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_BC is not set
+# CONFIG_HEXEDIT is not set
+# CONFIG_I2CTRANSFER is not set
+# CONFIG_LSSCSI is not set
+# CONFIG_MIM is not set
+# CONFIG_PARTPROBE is not set
+# CONFIG_SETFATTR is not set
+# CONFIG_SETSERIAL is not set
+# CONFIG_TS is not set
+
+#
+# Networking Utilities
+#
+# CONFIG_HOSTNAME is not set
+# CONFIG_DNSDOMAINNAME is not set
+# CONFIG_IFCONFIG is not set
+# CONFIG_IFUP is not set
+# CONFIG_IFDOWN is not set
+# CONFIG_IP is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_NC is not set
+# CONFIG_NETSTAT is not set
+# CONFIG_PING is not set
+# CONFIG_ROUTE is not set
+# CONFIG_TC is not set
+# CONFIG_TELNET is not set
+# CONFIG_WGET is not set
+# CONFIG_UDHCPC is not set
+
+#
+# Process Utilities
+#
+# CONFIG_KILLALL is not set
+# CONFIG_KILLALL5 is not set
+
+#
+# Runit Utilities
+#
+# CONFIG_SVC is not set
+# CONFIG_SVOK is not set
+
+#
+# Shells
+#
+CONFIG_BASH_IS_HUSH=y
+# CONFIG_BASH_IS_NONE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
+
+#
+# Options common to all shells
+#
+# CONFIG_FEATURE_SH_READ_FRAC is not set
+# CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set
diff --git a/board/canaan/k210-soc/genimage.cfg b/board/canaan/k210-soc/genimage.cfg
new file mode 100644
index 0000000000..da7d5dbafb
--- /dev/null
+++ b/board/canaan/k210-soc/genimage.cfg
@@ -0,0 +1,30 @@
+image boot.vfat {
+ vfat {
+ file uImage {
+ image = "uImage"
+ }
+
+ file k210.dtb {
+ image = "k210.dtb"
+ }
+ }
+ size = 4M
+}
+
+image sdcard.img {
+ hdimage {
+ }
+
+ partition boot {
+ partition-type = 0xC
+ image = "boot.vfat"
+ bootable = "true"
+ offset = 4M
+ }
+
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext2"
+ size = 64M
+ }
+}
diff --git a/board/canaan/k210-soc/linux-sdcard.config b/board/canaan/k210-soc/linux-sdcard.config
new file mode 100644
index 0000000000..4b0ead78a7
--- /dev/null
+++ b/board/canaan/k210-soc/linux-sdcard.config
@@ -0,0 +1,4 @@
+CONFIG_BUILTIN_DTB=n
+CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=n
+CONFIG_SOC_CANAAN_K210_DTB_SOURCE=""
+CONFIG_CMDLINE="earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro"
diff --git a/board/canaan/k210-soc/post-build.sh b/board/canaan/k210-soc/post-build.sh
new file mode 100755
index 0000000000..5b6f56a2c5
--- /dev/null
+++ b/board/canaan/k210-soc/post-build.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+MKIMAGE=${HOST_DIR}/bin/mkimage
+
+# Generate u-Boot kernel image
+${MKIMAGE} -A riscv -O linux -T kernel -C none \
+ -a 0x80000000 -e 0x80000000 \
+ -n Linux -d ${BINARIES_DIR}/loader.bin ${BINARIES_DIR}/uImage
+
+# Link the kernel-built board dtb file to using the k210.dtb generic
+# name for use by genimage.cfg
+BOARDDTBKPATH="$(grep BR2_LINUX_KERNEL_INTREE_DTS_NAME ${BR2_CONFIG} | cut -d'=' -f2 | tr -d \")"
+
+BOARDDTB="$(basename ${BOARDDTBKPATH})"
+if [ -z "${BOARDDTB}" ]; then
+ echo "Board DTB file not specified"
+ exit 1
+fi
+
+BOARDDTB="${BINARIES_DIR}/${BOARDDTB}.dtb"
+if [ ! -f "${BOARDDTB}" ]; then
+ echo "Board DTB file not found in ${BINARIES_DIR}"
+ exit 1
+fi
+
+TARGETDTB=${BINARIES_DIR}/k210.dtb
+rm -f ${TARGETDTB}
+ln -s ${BOARDDTB} ${TARGETDTB}
diff --git a/board/canaan/k210-soc/rootfs_overlay/init b/board/canaan/k210-soc/rootfs_overlay/init
new file mode 120000
index 0000000000..a0b71977c0
--- /dev/null
+++ b/board/canaan/k210-soc/rootfs_overlay/init
@@ -0,0 +1 @@
+/sbin/init
\ No newline at end of file
diff --git a/board/canaan/k210-soc/rootfs_overlay/sbin/init b/board/canaan/k210-soc/rootfs_overlay/sbin/init
new file mode 100755
index 0000000000..d4bf53d452
--- /dev/null
+++ b/board/canaan/k210-soc/rootfs_overlay/sbin/init
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# This script replaces the default busybox init process to avoid having that
+# process staying alive and sleeping in the background, (uselessly) consuming
+# precious memory.
+
+# Mount procfs and sysfs
+/bin/mount -t proc proc /proc
+/bin/mount -t sysfs sysfs /sys
+
+# When the kernel is directly booted, devtmpfs is not automatically mounted.
+# Manually mount it if needed.
+devmnt=$(mount | grep -c devtmpfs)
+if [ ${devmnt} -eq 0 ]; then
+ /bin/mount -t devtmpfs devtmpfs /dev
+fi
+
+# Use the /dev/console device node from devtmpfs if possible to not
+# confuse glibc's ttyname_r().
+# This may fail (E.G. booted with console=), and errors from exec will
+# terminate the shell, so use a subshell for the test
+if (exec 0</dev/console) 2>/dev/null; then
+ exec 0</dev/console
+ exec 1>/dev/console
+ exec 2>/dev/console
+fi
+
+# Clear memory to reduce page fragmentation
+echo 3 > /proc/sys/vm/drop_caches
+
+# Print a fun logo :)
+echo " __ _"
+echo " / / (_) ____ _ _ __ __"
+echo " / / | || _ \\ | | | |\\ \\/ /"
+echo " / /___| || | | || |_| | > < "
+echo " /_____/|_||_| |_| \\____|/_/\\_\\"
+echo " 64-bits RISC-V Kendryte K210 NOMMU"
+echo ""
+
+# Finally, let's start an interactive shell
+exec /bin/sh
diff --git a/board/canaan/k210-soc/uboot.config b/board/canaan/k210-soc/uboot.config
new file mode 100644
index 0000000000..159085f802
--- /dev/null
+++ b/board/canaan/k210-soc/uboot.config
@@ -0,0 +1 @@
+# CONFIG_WATCHDOG_AUTOSTART is not set
--
2.36.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v2 07/11] board: Add Sipeed MAIX-Bit board support
2022-05-30 3:38 [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Damien Le Moal via buildroot
` (5 preceding siblings ...)
2022-05-30 3:38 ` [Buildroot] [PATCH v2 06/11] board: Add common support for Canaan K210 SoC-based boards Damien Le Moal via buildroot
@ 2022-05-30 3:38 ` Damien Le Moal via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 08/11] board: Add Sipeed MAIXDUINO " Damien Le Moal via buildroot
` (4 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Damien Le Moal via buildroot @ 2022-05-30 3:38 UTC (permalink / raw)
To: buildroot, Thomas Petazzoni
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN
Add two buildroot configuration files to build a minimal Linux
environment for the Sipeed MAIX Bit board. The configurations are:
* sipeed_maix_bit_defconfig: Build a bootable kernel image with an
embedded initramfs root file system. The image built can be flashed to
the board as is and does not require a boot loader. This configuration
uses the tiny busybox configuration defined in
board/canaan/k210-soc/busybox-tiny.config.
* sipeed_maix_bit_sdcard_defconfig: Build a kernel image with a root
file system on the SD card and using U-Boot as the boot loader. This
uses the default busybox minimal configuration.
Both configurations also enable the python-kflash and pyserial-miniterm
host tools for flashing image files to the board and opening a terminal
console.
The readme.txt file documents how to build and boot the Sipeed MAIX-Bit
board with these configurations.
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
DEVELOPERS | 3 +
board/sipeed/maix-bit/linux-cpio.config | 2 +
board/sipeed/maix-bit/readme.txt | 316 +++++++++++++++++++++++
configs/sipeed_maix_bit_defconfig | 38 +++
configs/sipeed_maix_bit_sdcard_defconfig | 56 ++++
5 files changed, 415 insertions(+)
create mode 100644 board/sipeed/maix-bit/linux-cpio.config
create mode 100644 board/sipeed/maix-bit/readme.txt
create mode 100644 configs/sipeed_maix_bit_defconfig
create mode 100644 configs/sipeed_maix_bit_sdcard_defconfig
diff --git a/DEVELOPERS b/DEVELOPERS
index 93806b2c99..69503a95a3 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -630,6 +630,9 @@ F: package/log4cpp/
N: Damien Le Moal <damien.lemoal@wdc.com>
F: package/python-kflash/
F: board/canaan/
+F: board/sipeed/
+F: configs/sipeed_maix_bit_defconfig
+F: configs/sipeed_maix_bit_sdcard_defconfig
N: Daniel Nicoletti <dantti12@gmail.com>
F: package/cutelyst/
diff --git a/board/sipeed/maix-bit/linux-cpio.config b/board/sipeed/maix-bit/linux-cpio.config
new file mode 100644
index 0000000000..de2f8fd074
--- /dev/null
+++ b/board/sipeed/maix-bit/linux-cpio.config
@@ -0,0 +1,2 @@
+CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y
+CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maix_bit"
diff --git a/board/sipeed/maix-bit/readme.txt b/board/sipeed/maix-bit/readme.txt
new file mode 100644
index 0000000000..7cc53bca67
--- /dev/null
+++ b/board/sipeed/maix-bit/readme.txt
@@ -0,0 +1,316 @@
+Sipeed MAIX-Bit Board
+=====================
+
+The Sipeed MAXI-Bit board is a dual-core RISC-V 64-bits board based on the
+Canaan Kendryte K210 SoC.
+
+Prerequisite
+------------
+
+In order to use the kflash utility to program this board, the user must have
+access to the board USB serial device file. The simplest way to do this is to
+add your user to the same group as this device file. Assume the device file is
+/dev/ttyUSB0, first identify the device group name. In most cases, it is
+either "dialout" or "uucp". Also verify that read-write access is enabled for
+the group:
+
+```
+$ ls -l /dev/ttyUSB0
+crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0
+```
+
+Then add yourself to that group (dialout in this example):
+
+```
+$ sudo usermod -a -G dialout $(whoami)
+```
+
+To enable the above, it is sometimes necessary to logout and login again.
+
+Buildroot Configuration
+-----------------------
+
+Two buildroot configuration files are provided:
+
+(1) Direct Linux Kernel Boot
+
+This is defined by the sipeed_maix_bit_defconfig configuration. This
+configuration allows building a bootable kernel image with a built-in initramfs
+root file system (the board SD card is not used). The built kernel image can be
+flashed directly to the board ROM for direct booting. No boot loader is
+required.
+
+(2) U-Boot SD-Card Boot
+
+The sipeed_maix_bit_sdcard_defconfig configuration allows building a kernel
+image with the root file system on the board SD card. U-Boot is used as the
+boot loader.
+
+Both configuration files will also compile and install the kflash and
+pyserial-miniterm host utilities to program bootable image files to the board
+and open a serial terminal console.
+
+Direct Linux Kernel Boot
+-------------------------
+
+Using the sipeed_maix_bit_defconfig configuration, the bootable kernel binary
+image is built as follows.
+
+```
+$ make sipeed_maix_bit_defconfig
+$ make
+```
+
+The bootable binary image is the output/images/loader.bin file. This image file
+can be written to the board boot ROM using the kflash utility.
+
+```
+$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin
+```
+
+Once the kernel image file is fully programmed, a terminal console is open and
+the board can be rebooted by pressing the reset button on the board (if it does
+not reboot automatically).
+
+The output will be similar to the following.
+
+```
+[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 14:30:02 JST 2022
+[ 0.000000] Machine model: SiPeed MAIX BiT
+[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8')
+[ 0.000000] printk: bootconsole [sifive0] enabled
+[ 0.000000] Zone ranges:
+[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Normal empty
+[ 0.000000] Movable zone start for each node
+[ 0.000000] Early memory node ranges
+[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] riscv: ISA extensions acdfim
+[ 0.000000] riscv: ELF capabilities acdfim
+[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0
+[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056
+[ 0.000000] percpu: wasting 10 pages per chunk
+[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020
+[ 0.000000] Kernel command line: earlycon console=ttySIF0
+[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear)
+[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
+[ 0.000000] Memory: 5996K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 530K init, 66K bss, 2196K reserved, 0K cma-reserved)
+[ 0.000000] rcu: Hierarchical RCU implementation.
+[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies.
+[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0
+[ 0.000000] riscv-intc: 64 local interrupts mapped
+[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts.
+[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz
+[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz
+[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns
+[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns
+[ 0.008188] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200)
+[ 0.018250] pid_max: default: 4096 minimum: 301
+[ 0.022860] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.029972] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.040244] rcu: Hierarchical SRCU implementation.
+[ 0.045121] smp: Bringing up secondary CPUs ...
+[ 0.050225] smp: Brought up 1 node, 2 CPUs
+[ 0.054355] devtmpfs: initialized
+[ 0.071168] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns
+[ 0.080240] pinctrl core: initialized pinctrl subsystem
+[ 0.119221] clocksource: Switched to clocksource clint_clocksource
+[ 0.131498] workingset: timestamp_bits=62 max_order=11 bucket_order=0
+[ 0.176943] k210-sysctl 50440000.syscon: K210 system controller
+[ 0.193558] k210-rst 50440000.syscon:reset-controller: K210 reset controller
+[ 0.201526] cacheinfo: Unable to detect cache hierarchy for CPU 0
+[ 0.211611] i2c_dev: i2c /dev entries driver
+[ 0.221375] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller
+[ 0.233591] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0
+[ 0.242529] printk: console [ttySIF0] enabled
+[ 0.242529] printk: console [ttySIF0] enabled
+[ 0.251165] printk: bootconsole [sifive0] disabled
+[ 0.251165] printk: bootconsole [sifive0] disabled
+[ 0.274348] Freeing unused kernel image (initmem) memory: 524K
+[ 0.279504] This architecture does not have kernel memory protection.
+[ 0.285908] Run /init as init process
+ __ _
+ / / (_) ____ _ _ __ __
+ / / | || _ \ | | | |\ \/ /
+ / /___| || | | || |_| | > <
+ /_____/|_||_| |_| \____|/_/\_\
+ 64-bits RISC-V Kendryte K210 NOMMU
+
+/ #
+```
+
+To open a terminal console without re-flashing the board, the pyserial-miniterm
+host tool can be used.
+
+```
+$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200
+```
+
+The options "--raw" and "--eol=LF" are added here to avoid a double carriage
+return each time a command is entered.
+
+
+U-Boot SD-Card Boot
+-------------------
+
+The build procedure is similar to the direct Linux kernel boot case.
+
+```
+$ make sipeed_maix_bit_sdcard_defconfig
+$ make
+```
+
+The build process will generate two files under the output/images directory.
+
+* sdcard.img: The image file for the SD card filesystem. This image has 2
+ partitions. The first partition is a vfat partition containing the kernel
+ uImage and the board device tree binary. The second partition is the root
+ filesystem with busybox installed. The second partition is formatted using
+ ext2 (rev1).
+
+* uboot.bin: U-Boot bootable binary to load and boot the kernel from the SD
+ card.
+
+The SD card can be prepared by writing the sdcard.img file, as follows.
+
+```
+$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M
+$ sync
+$ eject /dev/sdX
+```
+
+Where /dev/sdX is the device file name of the SD card. Once completed, the SD
+card can be inserted into the board and the U-Boot binary image written to the
+board boot flash using the kflash utility.
+
+```
+$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/u-boot.bin
+```
+
+The above command will program U-Boot image to the board boot ROM and open a
+terminal console once the u-boot.bin file is fully programmed. Reboot into the
+newly programmed environment by pressing the board reset button.
+
+The output will be similar to the following.
+
+```
+U-Boot 2022.04 (May 24 2022 - 17:08:34 +0900)
+
+DRAM: 8 MiB
+Core: 34 devices, 17 uclasses, devicetree: separate
+WDT: Not starting watchdog@50400000
+MMC: spi@53000000:slot@0: 0
+Loading Environment from SPIFlash... SF: Detected gd25lq128 with page size 256 Bytes, erase size 4 KiB, total 16 MiB
+*** Warning - bad CRC, using default environment
+
+In: serial@38000000
+Out: serial@38000000
+Err: serial@38000000
+Hit any key to stop autoboot: 0
+1668562 bytes read in 933 ms (1.7 MiB/s)
+10468 bytes read in 11 ms (928.7 KiB/s)
+## Booting kernel from Legacy Image at 80060000 ...
+ Image Name: Linux
+ Image Type: RISC-V Linux Kernel Image (uncompressed)
+ Data Size: 1668498 Bytes = 1.6 MiB
+ Load Address: 80000000
+ Entry Point: 80000000
+ Verifying Checksum ... OK
+## Flattened Device Tree blob at 80400000
+ Booting using the fdt blob at 0x80400000
+ Loading Kernel Image
+ Loading Device Tree to 00000000803fa000, end 00000000803ff8e3 ... OK
+
+Starting kernel ...
+
+[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-1056-gc356b62332) 10.3.0, GNU ld (GNU Binutils) 2.37) #1 SMP Tue May 24 06:45:04 JST 2022
+[ 0.000000] Machine model: SiPeed MAIX BiT
+[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8')
+[ 0.000000] printk: bootconsole [sifive0] enabled
+[ 0.000000] Zone ranges:
+[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Normal empty
+[ 0.000000] Movable zone start for each node
+[ 0.000000] Early memory node ranges
+[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] riscv: base ISA extensions acdfim
+[ 0.000000] riscv: ELF capabilities acdfim
+[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0
+[ 0.000000] percpu: Embedded 11 pages/cpu s15648 r0 d29408 u45056
+[ 0.000000] percpu: wasting 10 pages per chunk
+[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020
+[ 0.000000] Kernel command line: earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro
+[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear)
+[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
+[ 0.000000] Memory: 6204K/8192K available (1134K kernel code, 150K rwdata, 239K rodata, 100K init, 68K bss, 1988K reserved, 0K cma-reserved)
+[ 0.000000] rcu: Hierarchical RCU implementation.
+[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies.
+[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0
+[ 0.000000] riscv-intc: 64 local interrupts mapped
+[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts.
+[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz
+[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz
+[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns
+[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns
+[ 0.008194] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200)
+[ 0.018257] pid_max: default: 4096 minimum: 301
+[ 0.022869] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.029982] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.040424] rcu: Hierarchical SRCU implementation.
+[ 0.045397] smp: Bringing up secondary CPUs ...
+[ 0.050518] smp: Brought up 1 node, 2 CPUs
+[ 0.054676] devtmpfs: initialized
+[ 0.072365] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns
+[ 0.081396] pinctrl core: initialized pinctrl subsystem
+[ 0.123762] clocksource: Switched to clocksource clint_clocksource
+[ 0.136796] workingset: timestamp_bits=62 max_order=11 bucket_order=0
+[ 0.181768] k210-sysctl 50440000.syscon: K210 system controller
+[ 0.198397] k210-rst 50440000.syscon:reset-controller: K210 reset controller
+[ 0.207373] cacheinfo: Unable to detect cache hierarchy for CPU 0
+[ 0.218270] spi spi1.0: setup: ignoring unsupported mode bits a00
+[ 0.224786] i2c_dev: i2c /dev entries driver
+[ 0.235984] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller
+[ 0.249172] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0
+[ 0.258078] printk: console [ttySIF0] enabled
+[ 0.258078] printk: console [ttySIF0] enabled
+[ 0.266707] printk: bootconsole [sifive0] disabled
+[ 0.266707] printk: bootconsole [sifive0] disabled
+[ 0.307910] mmc_spi spi3.0: SD/MMC host mmc0, no WP, no poweroff, cd polling
+[ 0.319869] Waiting for root device /dev/mmcblk0p2...
+[ 0.345016] mmc0: host does not support reading read-only switch, assuming write-enable
+[ 0.352330] mmc0: new SDHC card on SPI
+[ 0.359338] mmcblk0: mmc0:0000 SA16G 14.5 GiB
+[ 0.367589] random: fast init done
+[ 0.371533] mmcblk0: p1 p2
+[ 0.391794] random: get_random_bytes called from 0x0000000080095ae8 with crng_init=1
+[ 0.393388] VFS: Mounted root (ext2 filesystem) readonly on device 179:2.
+[ 0.411377] devtmpfs: mounted
+[ 0.413922] Freeing unused kernel image (initmem) memory: 96K
+[ 0.419344] This architecture does not have kernel memory protection.
+[ 0.425777] Run /sbin/init as init process
+[ 0.718314] random: crng init done
+[ 0.799903] init (1): drop_caches: 3
+ __ _
+ / / (_) ____ _ _ __ __
+ / / | || _ \ | | | |\ \/ /
+ / /___| || | | || |_| | > <
+ /_____/|_||_| |_| \____|/_/\_\
+ 64-bits RISC-V Kendryte K210 NOMMU
+
+/ #
+```
+
+Of note is that the kernel mounts the SD card as read-only by default to avoid
+corruptions of the ext2 root file system when the board is powered down. This
+is recommended as this board does not support clean shutdown or halt.
+
+Similarly to the initramfs build case, a console can be open without
+re-flashing the board using the host tool pyserial-miniterm.
+
+```
+$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200
+```
diff --git a/configs/sipeed_maix_bit_defconfig b/configs/sipeed_maix_bit_defconfig
new file mode 100644
index 0000000000..3fab30bcd2
--- /dev/null
+++ b/configs/sipeed_maix_bit_defconfig
@@ -0,0 +1,38 @@
+# Architecture
+BR2_riscv=y
+BR2_RISCV_64=y
+BR2_riscv_custom=y
+BR2_RISCV_ISA_CUSTOM_RVM=y
+BR2_RISCV_ISA_CUSTOM_RVA=y
+BR2_RISCV_ISA_CUSTOM_RVF=y
+BR2_RISCV_ISA_CUSTOM_RVD=y
+BR2_RISCV_ISA_CUSTOM_RVC=y
+BR2_RISCV_ABI_LP64D=y
+
+# Binary format
+# BR2_USE_MMU is not set
+BR2_BINFMT_FLAT=y
+BR2_BINFMT_FLAT_ONE=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_PATCH="board/riscv/nommu/kernel_patches"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.18"
+BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/maix-bit/linux-cpio.config"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin"
+
+# Packages
+BR2_PACKAGE_HOST_ELF2FLT=y
+BR2_PACKAGE_HOST_PYTHON_KFLASH=y
+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config"
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+
+# Filesystem
+BR2_INIT_NONE=y
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
diff --git a/configs/sipeed_maix_bit_sdcard_defconfig b/configs/sipeed_maix_bit_sdcard_defconfig
new file mode 100644
index 0000000000..b66dbd4a35
--- /dev/null
+++ b/configs/sipeed_maix_bit_sdcard_defconfig
@@ -0,0 +1,56 @@
+# Architecture
+BR2_riscv=y
+BR2_RISCV_64=y
+BR2_riscv_custom=y
+BR2_RISCV_ISA_CUSTOM_RVM=y
+BR2_RISCV_ISA_CUSTOM_RVA=y
+BR2_RISCV_ISA_CUSTOM_RVF=y
+BR2_RISCV_ISA_CUSTOM_RVD=y
+BR2_RISCV_ISA_CUSTOM_RVC=y
+BR2_RISCV_ABI_LP64D=y
+
+# System
+# BR2_USE_MMU is not set
+BR2_BINFMT_FLAT=y
+BR2_BINFMT_FLAT_ONE=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_PATCH="board/riscv/nommu/kernel_patches"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.18"
+BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210_sdcard"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/linux-sdcard.config"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_bit"
+
+# Packages
+BR2_PACKAGE_HOST_ELF2FLT=y
+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+
+# Filesystem
+BR2_INIT_NONE=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_SIZE=64M
+BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/canaan/k210-soc/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/canaan/k210-soc/genimage.cfg"
+
+# Bootloader and related host tools
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sipeed_maix_bitm"
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_PYTHON_KFLASH=y
--
2.36.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v2 08/11] board: Add Sipeed MAIXDUINO board support
2022-05-30 3:38 [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Damien Le Moal via buildroot
` (6 preceding siblings ...)
2022-05-30 3:38 ` [Buildroot] [PATCH v2 07/11] board: Add Sipeed MAIX-Bit board support Damien Le Moal via buildroot
@ 2022-05-30 3:38 ` Damien Le Moal via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 09/11] board: Add Sipeed MAIX-Dock " Damien Le Moal via buildroot
` (3 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Damien Le Moal via buildroot @ 2022-05-30 3:38 UTC (permalink / raw)
To: buildroot, Thomas Petazzoni
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN
Add two buildroot configuration files to build a minimal Linux
environment for the Sipeed MAIXDUINO board. The configurations are:
* sipeed_maixduino_defconfig: Build a bootable kernel image with an
embedded initramfs root file system. The image built can be flashed to
the board as is and does not require a boot loader. This configuration
uses the tiny busybox configuration defined in
board/canaan/k210-soc/busybox-tiny.config.
* sipeed_maixduino_sdcard_defconfig: Build a kernel image with a root
file system on the SD card and using U-Boot as the boot loader. This
uses the default busybox minimal configuration.
Both configurations also enable the kflash and pyserial-miniterm host
tools for flashing image files to the board and opening a terminal
console.
The readme.txt file documents how to build and boot the Sipeed MAIXDUINO
board with these configurations.
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
DEVELOPERS | 2 +
board/sipeed/maixduino/linux-cpio.config | 2 +
board/sipeed/maixduino/readme.txt | 292 ++++++++++++++++++++++
configs/sipeed_maixduino_defconfig | 38 +++
configs/sipeed_maixduino_sdcard_defconfig | 56 +++++
5 files changed, 390 insertions(+)
create mode 100644 board/sipeed/maixduino/linux-cpio.config
create mode 100644 board/sipeed/maixduino/readme.txt
create mode 100644 configs/sipeed_maixduino_defconfig
create mode 100644 configs/sipeed_maixduino_sdcard_defconfig
diff --git a/DEVELOPERS b/DEVELOPERS
index 69503a95a3..570aea8c65 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -633,6 +633,8 @@ F: board/canaan/
F: board/sipeed/
F: configs/sipeed_maix_bit_defconfig
F: configs/sipeed_maix_bit_sdcard_defconfig
+F: configs/sipeed_maixduino_defconfig
+F: configs/sipeed_maixduino_sdcard_defconfig
N: Daniel Nicoletti <dantti12@gmail.com>
F: package/cutelyst/
diff --git a/board/sipeed/maixduino/linux-cpio.config b/board/sipeed/maixduino/linux-cpio.config
new file mode 100644
index 0000000000..049a2550c5
--- /dev/null
+++ b/board/sipeed/maixduino/linux-cpio.config
@@ -0,0 +1,2 @@
+CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y
+CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maixduino"
diff --git a/board/sipeed/maixduino/readme.txt b/board/sipeed/maixduino/readme.txt
new file mode 100644
index 0000000000..53a9e5c2ac
--- /dev/null
+++ b/board/sipeed/maixduino/readme.txt
@@ -0,0 +1,292 @@
+Sipeed MAIXDUINO Board
+======================
+
+The Sipeed MAIXDUINO board is a dual-core RISC-V 64-bits board based on the
+Canaan Kendryte K210 SoC. This board has the same form factor as the Arduino
+UNO board.
+
+Prerequisite
+------------
+
+In order to use the kflash utility to program this board, the user must have
+access to the board USB serial device file. The simplest way to do this is to
+add your user to the same group as this device file. Assume the device file is
+/dev/ttyUSB0, first identify the device group name. In most cases, it is
+either "dialout" or "uucp". Also verify that read-write access is enabled for
+the group:
+
+```
+$ ls -l /dev/ttyUSB0
+crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0
+```
+
+Then add yourself to that group (dialout in this example):
+
+```
+$ sudo usermod -a -G dialout $(whoami)
+```
+
+To enable the above, it is sometimes necessary to logout and login again.
+
+Buildroot Configuration
+-----------------------
+
+Two buildroot configurations are provided:
+
+(1) Direct Linux Kernel Boot
+
+This is defined by the sipeed_maixduino_defconfig configuration. This
+configuration allows building a bootable kernel image with a built-in initramfs
+root file system (the board SD card is not used). The built kernel image can be
+flashed directly to the board ROM for direct booting. No boot loader is
+required.
+
+(2) U-Boot SD-Card Boot
+
+The sipeed_maixduino_sdcard_defconfig configuration allows building a kernel
+image with the root file system on the board SD card. U-Boot is used as the
+boot loader.
+
+Note: U-Boot does not natively support the Sipeed MAIXDUINO board. However, the
+board and device tree differences with the Sipeed MAIX-bit board are small
+enough for U-Boot to work.
+
+Both configuration files will also compile and install the kflash and
+pyserial-miniterm host utilities to program bootable image files to the board
+and open a serial terminal console.
+
+Direct Linux Kernel Boot
+------------------------
+
+Using the sipeed_maixduino_defconfig configuration, the bootable kernel binary
+image is built as follows.
+
+```
+$ make sipeed_maixduino_defconfig
+$ make
+```
+
+The bootable binary image is the output/images/loader.bin file. This image file
+can be written to the board boot flash using the kflash utility.
+
+```
+$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin
+```
+
+Once the kernel image file is fully programmed, a terminal console is open and
+the board can be rebooted by pressing the reset button on the board (if it does
+not reboot automatically).
+
+The output will be similar to the following.
+
+```
+[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 15:16:00 JST 2022
+[ 0.000000] Machine model: SiPeed MAIXDUINO
+[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8')
+[ 0.000000] printk: bootconsole [sifive0] enabled
+[ 0.000000] Zone ranges:
+[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Normal empty
+[ 0.000000] Movable zone start for each node
+[ 0.000000] Early memory node ranges
+[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] riscv: ISA extensions acdfim
+[ 0.000000] riscv: ELF capabilities acdfim
+[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0
+[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056
+[ 0.000000] percpu: wasting 10 pages per chunk
+[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020
+[ 0.000000] Kernel command line: earlycon console=ttySIF0
+[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear)
+[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
+[ 0.000000] Memory: 6000K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 530K init, 66K bss, 2192K reserved, 0K cma-reserved)
+[ 0.000000] rcu: Hierarchical RCU implementation.
+[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies.
+[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0
+[ 0.000000] riscv-intc: 64 local interrupts mapped
+[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts.
+[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz
+[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz
+[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns
+[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns
+[ 0.008183] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200)
+[ 0.018249] pid_max: default: 4096 minimum: 301
+[ 0.022860] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.029971] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.040242] rcu: Hierarchical SRCU implementation.
+[ 0.045124] smp: Bringing up secondary CPUs ...
+[ 0.050217] smp: Brought up 1 node, 2 CPUs
+[ 0.054346] devtmpfs: initialized
+[ 0.070924] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns
+[ 0.079996] pinctrl core: initialized pinctrl subsystem
+[ 0.119893] clocksource: Switched to clocksource clint_clocksource
+[ 0.131992] workingset: timestamp_bits=62 max_order=11 bucket_order=0
+[ 0.179099] k210-sysctl 50440000.syscon: K210 system controller
+[ 0.194904] k210-rst 50440000.syscon:reset-controller: K210 reset controller
+[ 0.203108] cacheinfo: Unable to detect cache hierarchy for CPU 0
+[ 0.213867] i2c_dev: i2c /dev entries driver
+[ 0.223397] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller
+[ 0.235632] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0
+[ 0.244585] printk: console [ttySIF0] enabled
+[ 0.244585] printk: console [ttySIF0] enabled
+[ 0.253190] printk: bootconsole [sifive0] disabled
+[ 0.253190] printk: bootconsole [sifive0] disabled
+[ 0.264820] panel@0 enforce active low on chipselect handle
+[ 0.281482] Freeing unused kernel image (initmem) memory: 524K
+[ 0.286621] This architecture does not have kernel memory protection.
+[ 0.293047] Run /init as init process
+ __ _
+ / / (_) ____ _ _ __ __
+ / / | || _ \ | | | |\ \/ /
+ / /___| || | | || |_| | > <
+ /_____/|_||_| |_| \____|/_/\_\
+ 64-bits RISC-V Kendryte K210 NOMMU
+
+/ #
+```
+
+To open a terminal console without re-flashing the board, the pyserial-miniterm
+host tool can be used.
+
+```
+$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200
+```
+
+The options "--raw" and "--eol=LF" are added here to avoid a double carriage
+return each time a command is entered.
+
+
+U-Boot SD-Card Boot
+-------------------
+
+The build procedure is similar to the built-in initramfs case.
+
+```
+$ make sipeed_maixduino_sdcard_defconfig
+$ make
+```
+
+The build process will generate two files under the output/images directory.
+
+* sdcard.img: The image file for the SD card filesystem. This image has 2
+ partitions. The first partition is a vfat partition containing the kernel
+ uImage and the board device tree binary. The second partition is the root
+ filesystem with busybox installed. The second partition is formatted using
+ ext2 (rev1).
+
+* uboot.bin: U-Boot bootable binary to load and boot the kernel from the SD
+ card.
+
+The SD card can be prepared by writing the sdcard.img file, as follows.
+
+```
+$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M
+$ sync
+$ eject /dev/sdX
+```
+
+Where /dev/sdX is the device file name of the SD card. Once completed, the SD
+card can be inserted into the board and the U-Boot binary image written to the
+board boot flash using the kflash utility.
+
+```
+$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/u-boot.bin
+```
+
+The above command will program U-Boot image to the board boot ROM and open a
+terminal console once the u-boot.bin file is fully programmed. Reboot into the
+newly programmed environment by pressing the board reset button.
+
+The output will be similar to the following.
+
+```
+[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #1 SMP Thu Apr 21 15:30:18 JST 2022
+[ 0.000000] Machine model: SiPeed MAIXDUINO
+[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8')
+[ 0.000000] printk: bootconsole [sifive0] enabled
+[ 0.000000] Zone ranges:
+[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Normal empty
+[ 0.000000] Movable zone start for each node
+[ 0.000000] Early memory node ranges
+[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] riscv: ISA extensions acdfim
+[ 0.000000] riscv: ELF capabilities acdfim
+[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0
+[ 0.000000] percpu: Embedded 11 pages/cpu s15392 r0 d29664 u45056
+[ 0.000000] percpu: wasting 10 pages per chunk
+[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020
+[ 0.000000] Kernel command line: earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro
+[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear)
+[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
+[ 0.000000] Memory: 6156K/8192K available (1180K kernel code, 151K rwdata, 239K rodata, 102K init, 69K bss, 2036K reserved, 0K cma-reserved)
+[ 0.000000] rcu: Hierarchical RCU implementation.
+[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies.
+[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0
+[ 0.000000] riscv-intc: 64 local interrupts mapped
+[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts.
+[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz
+[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz
+[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns
+[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns
+[ 0.008191] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200)
+[ 0.018255] pid_max: default: 4096 minimum: 301
+[ 0.022876] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.029982] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.040417] rcu: Hierarchical SRCU implementation.
+[ 0.045397] smp: Bringing up secondary CPUs ...
+[ 0.050513] smp: Brought up 1 node, 2 CPUs
+[ 0.054680] devtmpfs: initialized
+[ 0.072127] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns
+[ 0.081205] pinctrl core: initialized pinctrl subsystem
+[ 0.125074] clocksource: Switched to clocksource clint_clocksource
+[ 0.138311] workingset: timestamp_bits=62 max_order=11 bucket_order=0
+[ 0.183471] k210-sysctl 50440000.syscon: K210 system controller
+[ 0.199873] k210-rst 50440000.syscon:reset-controller: K210 reset controller
+[ 0.208858] cacheinfo: Unable to detect cache hierarchy for CPU 0
+[ 0.221586] i2c_dev: i2c /dev entries driver
+[ 0.232786] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller
+[ 0.246572] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0
+[ 0.255508] printk: console [ttySIF0] enabled
+[ 0.255508] printk: console [ttySIF0] enabled
+[ 0.264137] printk: bootconsole [sifive0] disabled
+[ 0.264137] printk: bootconsole [sifive0] disabled
+[ 0.275560] panel@0 enforce active low on chipselect handle
+[ 0.313245] mmc_spi spi3.0: SD/MMC host mmc0, no WP, no poweroff, cd polling
+[ 0.322845] Waiting for root device /dev/mmcblk0p2...
+[ 0.345869] mmc0: host does not support reading read-only switch, assuming write-enable
+[ 0.353221] mmc0: new SDHC card on SPI
+[ 0.360233] mmcblk0: mmc0:0000 SA16G 14.5 GiB
+[ 0.368350] random: fast init done
+[ 0.372926] mmcblk0: p1 p2
+[ 0.391887] random: get_random_bytes called from 0x000000008009b7d2 with crng_init=1
+[ 0.400427] VFS: Mounted root (ext2 filesystem) readonly on device 179:2.
+[ 0.410128] devtmpfs: mounted
+[ 0.412628] Freeing unused kernel image (initmem) memory: 96K
+[ 0.418137] This architecture does not have kernel memory protection.
+[ 0.424530] Run /sbin/init as init process
+[ 0.563384] random: crng init done
+ __ _
+ / / (_) ____ _ _ __ __
+ / / | || _ \ | | | |\ \/ /
+ / /___| || | | || |_| | > <
+ /_____/|_||_| |_| \____|/_/\_\
+ 64-bits RISC-V Kendryte K210 NOMMU
+
+/ #
+```
+
+Of note is that the kernel mounts the SD card as read-only by default to avoid
+corruptions of the ext2 root file system when the board is powered down. This
+is recommended as this board does not support clean shutdown or halt.
+
+Similarly to the initramfs build case, a console can be open without
+re-flashing the board using the host tool pyserial-miniterm.
+
+```
+$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200
+```
diff --git a/configs/sipeed_maixduino_defconfig b/configs/sipeed_maixduino_defconfig
new file mode 100644
index 0000000000..8013e98e05
--- /dev/null
+++ b/configs/sipeed_maixduino_defconfig
@@ -0,0 +1,38 @@
+# Architecture
+BR2_riscv=y
+BR2_RISCV_64=y
+BR2_riscv_custom=y
+BR2_RISCV_ISA_CUSTOM_RVM=y
+BR2_RISCV_ISA_CUSTOM_RVA=y
+BR2_RISCV_ISA_CUSTOM_RVF=y
+BR2_RISCV_ISA_CUSTOM_RVD=y
+BR2_RISCV_ISA_CUSTOM_RVC=y
+BR2_RISCV_ABI_LP64D=y
+
+# Binary format
+# BR2_USE_MMU is not set
+BR2_BINFMT_FLAT=y
+BR2_BINFMT_FLAT_ONE=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_PATCH="board/riscv/nommu/kernel_patches"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.18"
+BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/maixduino/linux-cpio.config"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin"
+
+# Packages
+BR2_PACKAGE_HOST_ELF2FLT=y
+BR2_PACKAGE_HOST_PYTHON_KFLASH=y
+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config"
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+
+# Filesystem
+BR2_INIT_NONE=y
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
diff --git a/configs/sipeed_maixduino_sdcard_defconfig b/configs/sipeed_maixduino_sdcard_defconfig
new file mode 100644
index 0000000000..2e2cff4088
--- /dev/null
+++ b/configs/sipeed_maixduino_sdcard_defconfig
@@ -0,0 +1,56 @@
+# Architecture
+BR2_riscv=y
+BR2_RISCV_64=y
+BR2_riscv_custom=y
+BR2_RISCV_ISA_CUSTOM_RVM=y
+BR2_RISCV_ISA_CUSTOM_RVA=y
+BR2_RISCV_ISA_CUSTOM_RVF=y
+BR2_RISCV_ISA_CUSTOM_RVD=y
+BR2_RISCV_ISA_CUSTOM_RVC=y
+BR2_RISCV_ABI_LP64D=y
+
+# System
+# BR2_USE_MMU is not set
+BR2_BINFMT_FLAT=y
+BR2_BINFMT_FLAT_ONE=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_PATCH="board/riscv/nommu/kernel_patches"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.18"
+BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210_sdcard"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/linux-sdcard.config"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maixduino"
+
+# Packages
+BR2_PACKAGE_HOST_ELF2FLT=y
+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+
+# Filesystem
+BR2_INIT_NONE=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_SIZE=64M
+BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/canaan/k210-soc/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/canaan/k210-soc/genimage.cfg"
+
+# Bootloader and related host tools
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sipeed_maix_bitm"
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_PYTHON_KFLASH=y
--
2.36.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v2 09/11] board: Add Sipeed MAIX-Dock board support
2022-05-30 3:38 [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Damien Le Moal via buildroot
` (7 preceding siblings ...)
2022-05-30 3:38 ` [Buildroot] [PATCH v2 08/11] board: Add Sipeed MAIXDUINO " Damien Le Moal via buildroot
@ 2022-05-30 3:38 ` Damien Le Moal via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 10/11] board: Add Sipeed MAIX-Go " Damien Le Moal via buildroot
` (2 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Damien Le Moal via buildroot @ 2022-05-30 3:38 UTC (permalink / raw)
To: buildroot, Thomas Petazzoni
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN
Add two buildroot configuration files to build a minimal Linux
environment for the Sipeed MAIX-Dock board. The configurations are:
* sipeed_maix_dock_defconfig: Build a bootable kernel image with an
embedded initramfs root file system. The image built can be flashed to
the board as is and does not require a boot loader. This configuration
uses the tiny busybox configuration defined in
board/canaan/k210-soc/busybox-tiny.config.
* sipeed_maix_dock_sdcard_defconfig: Build a kernel image with a root
file system on the SD card and using U-Boot as the boot loader. This
uses the default busybox minimal configuration.
Both configurations also enable the kflash and pyserial-miniterm host
tools for flashing image files to the board and opening a terminal
console.
The readme.txt file documents how to build and boot the Sipeed
MAIX-Dock board with these configurations.
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
DEVELOPERS | 2 +
board/sipeed/maix-dock/linux-cpio.config | 2 +
board/sipeed/maix-dock/readme.txt | 321 ++++++++++++++++++++++
configs/sipeed_maix_dock_defconfig | 38 +++
configs/sipeed_maix_dock_sdcard_defconfig | 56 ++++
5 files changed, 419 insertions(+)
create mode 100644 board/sipeed/maix-dock/linux-cpio.config
create mode 100644 board/sipeed/maix-dock/readme.txt
create mode 100644 configs/sipeed_maix_dock_defconfig
create mode 100644 configs/sipeed_maix_dock_sdcard_defconfig
diff --git a/DEVELOPERS b/DEVELOPERS
index 570aea8c65..493699ce13 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -635,6 +635,8 @@ F: configs/sipeed_maix_bit_defconfig
F: configs/sipeed_maix_bit_sdcard_defconfig
F: configs/sipeed_maixduino_defconfig
F: configs/sipeed_maixduino_sdcard_defconfig
+F: configs/sipeed_maix_dock_defconfig
+F: configs/sipeed_maix_dock_sdcard_defconfig
N: Daniel Nicoletti <dantti12@gmail.com>
F: package/cutelyst/
diff --git a/board/sipeed/maix-dock/linux-cpio.config b/board/sipeed/maix-dock/linux-cpio.config
new file mode 100644
index 0000000000..b1ca3166f8
--- /dev/null
+++ b/board/sipeed/maix-dock/linux-cpio.config
@@ -0,0 +1,2 @@
+CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y
+CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maix_dock"
diff --git a/board/sipeed/maix-dock/readme.txt b/board/sipeed/maix-dock/readme.txt
new file mode 100644
index 0000000000..183a4d0421
--- /dev/null
+++ b/board/sipeed/maix-dock/readme.txt
@@ -0,0 +1,321 @@
+Sipeed MAIX-Dock Board
+======================
+
+The Sipeed MAXI-Dock board is a dual-core RISC-V 64-bits board based on the
+Canaan Kendryte K210 SoC.
+
+Prerequisite
+------------
+
+In order to use the kflash utility to program this board, the user must have
+access to the board USB serial device file. The simplest way to do this is to
+add your user to the same group as this device file. Assume the device file is
+/dev/ttyUSB0, first identify the device group name. In most cases, it is
+either "dialout" or "uucp". Also verify that read-write access is enabled for
+the group:
+
+```
+$ ls -l /dev/ttyUSB0
+crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0
+```
+
+Then add yourself to that group (dialout in this example):
+
+```
+$ sudo usermod -a -G dialout $(whoami)
+```
+
+To enable the above, it is sometimes necessary to logout and login again.
+
+Buildroot Configuration
+-----------------------
+
+Two buildroot configuration files are provided:
+
+(1) Direct Linux Kernel Boot
+
+This is defined by the sipeed_maix_dock_defconfig configuration. This
+configuration allows building a bootable kernel image with a built-in initramfs
+root file system (the board SD card is not used). The built kernel image can be
+flashed directly to the board ROM for direct booting. No boot loader is
+required.
+
+(2) U-Boot SD-Card Boot
+
+The sipeed_maix_dock_sdcard_defconfig configuration allows building a kernel
+image with the root file system on the board SD card. U-Boot is used as the
+boot loader.
+
+Note: U-Boot does not natively support the Sipeed MAIX-Dock board. However, the
+board and device tree differences with the Sipeed MAIX-Bit board are small
+enough for U-Boot to work.
+
+Both configuration files will also compile the pyserial-miniterm host tool open
+a serial terminal console for the board.
+
+Direct Linux Kernel Boot
+-------------------------
+
+Using the sipeed_maix_dock_defconfig configuration, the bootable kernel binary
+image is built as follows.
+
+```
+$ make sipeed_maix_dock_defconfig
+$ make
+```
+
+Both configuration files will also compile and install the kflash and
+pyserial-miniterm host utilities to program bootable image files to the board
+and open a serial terminal console.
+
+```
+$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin
+```
+
+Once the kernel image file is fully programmed, a terminal console is open and
+the board can be rebooted by pressing the reset button on the board (if it does
+not reboot automatically).
+
+The output will be similar to the following.
+
+```
+[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 15:47:42 JST 2022
+[ 0.000000] Machine model: SiPeed MAIX Dock
+[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8')
+[ 0.000000] printk: bootconsole [sifive0] enabled
+[ 0.000000] Zone ranges:
+[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Normal empty
+[ 0.000000] Movable zone start for each node
+[ 0.000000] Early memory node ranges
+[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] riscv: ISA extensions acdfim
+[ 0.000000] riscv: ELF capabilities acdfim
+[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0
+[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056
+[ 0.000000] percpu: wasting 10 pages per chunk
+[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020
+[ 0.000000] Kernel command line: earlycon console=ttySIF0
+[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear)
+[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
+[ 0.000000] Memory: 5980K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 546K init, 66K bss, 2212K reserved, 0K cma-reserved)
+[ 0.000000] rcu: Hierarchical RCU implementation.
+[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies.
+[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0
+[ 0.000000] riscv-intc: 64 local interrupts mapped
+[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts.
+[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz
+[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz
+[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns
+[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns
+[ 0.008187] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200)
+[ 0.018250] pid_max: default: 4096 minimum: 301
+[ 0.022859] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.029971] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.040238] rcu: Hierarchical SRCU implementation.
+[ 0.045110] smp: Bringing up secondary CPUs ...
+[ 0.050215] smp: Brought up 1 node, 2 CPUs
+[ 0.054345] devtmpfs: initialized
+[ 0.071112] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns
+[ 0.080182] pinctrl core: initialized pinctrl subsystem
+[ 0.120689] clocksource: Switched to clocksource clint_clocksource
+[ 0.133165] workingset: timestamp_bits=62 max_order=11 bucket_order=0
+[ 0.181750] k210-sysctl 50440000.syscon: K210 system controller
+[ 0.198612] k210-rst 50440000.syscon:reset-controller: K210 reset controller
+[ 0.206644] cacheinfo: Unable to detect cache hierarchy for CPU 0
+[ 0.216569] i2c_dev: i2c /dev entries driver
+[ 0.225905] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller
+[ 0.238866] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0
+[ 0.247778] printk: console [ttySIF0] enabled
+[ 0.247778] printk: console [ttySIF0] enabled
+[ 0.256459] printk: bootconsole [sifive0] disabled
+[ 0.256459] printk: bootconsole [sifive0] disabled
+[ 0.268225] panel@0 enforce active low on chipselect handle
+[ 0.285238] Freeing unused kernel image (initmem) memory: 540K
+[ 0.290372] This architecture does not have kernel memory protection.
+[ 0.296807] Run /init as init process
+ __ _
+ / / (_) ____ _ _ __ __
+ / / | || _ \ | | | |\ \/ /
+ / /___| || | | || |_| | > <
+ /_____/|_||_| |_| \____|/_/\_\
+ 64-bits RISC-V Kendryte K210 NOMMU
+
+/ #
+```
+
+To open a terminal console without re-flashing the board, the pyserial-miniterm
+host tool can be used.
+
+```
+$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200
+```
+
+The options "--raw" and "--eol=LF" are added here to avoid a double carriage
+return each time a command is entered.
+
+
+U-Boot SD-Card Boot
+-------------------
+
+The build procedure is similar to the built-in initramfs case.
+
+```
+$ make sipeed_maix_dock_sdcard_defconfig
+$ make
+```
+
+The build process will generate two files under the output/images directory.
+
+* sdcard.img: The image file for the SD card filesystem. This image has 2
+ partitions. The first partition is a vfat partition containing the kernel
+ uImage and the board device tree binary. The second partition is the root
+ filesystem with busybox installed. The second partition is formatted using
+ ext2 (rev1).
+
+* uboot.bin: U-Boot bootable binary to load and boot the kernel from the SD
+ card.
+
+The SD card can be prepared by writing the sdcard.img file, as follows.
+
+```
+$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M
+$ sync
+$ eject /dev/sdX
+```
+
+Where /dev/sdX is the device file name of the SD card. Once completed, the SD
+card can be inserted into the board and the U-Boot binary image written to the
+board boot flash using the kflash utility.
+
+```
+$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/u-boot.bin
+```
+
+The above command will program U-Boot image to the board boot ROM and open a
+terminal console once the u-boot.bin file is fully programmed. Reboot into the
+newly programmed environment by pressing the board reset button if it does
+not reboot automatically.
+
+The output will be similar to the following.
+
+```
+U-Boot 2022.04 (Apr 21 2022 - 15:59:50 +0900)
+
+DRAM: 8 MiB
+Core: 34 devices, 17 uclasses, devicetree: separate
+WDT: Not starting watchdog@50400000
+MMC: spi@53000000:slot@0: 0
+Loading Environment from SPIFlash... SF: Detected w25q128fw with page size 256 Bytes, erase size 4 KiB, total 16 MiB
+*** Warning - bad CRC, using default environment
+
+In: serial@38000000
+Out: serial@38000000
+Err: serial@38000000
+Hit any key to stop autoboot: 0
+1717730 bytes read in 957 ms (1.7 MiB/s)
+10382 bytes read in 11 ms (920.9 KiB/s)
+## Booting kernel from Legacy Image at 80060000 ...
+ Image Name: Linux
+ Image Type: RISC-V Linux Kernel Image (uncompressed)
+ Data Size: 1717666 Bytes = 1.6 MiB
+ Load Address: 80000000
+ Entry Point: 80000000
+ Verifying Checksum ... OK
+## Flattened Device Tree blob at 80400000
+ Booting using the fdt blob at 0x80400000
+ Loading Kernel Image
+ Loading Device Tree to 00000000803fa000, end 00000000803ff88d ... OK
+
+Starting kernel ...
+
+[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #1 SMP Thu Apr 21 16:00:03 JST 2022
+[ 0.000000] Machine model: SiPeed MAIX Dock
+[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8')
+[ 0.000000] printk: bootconsole [sifive0] enabled
+[ 0.000000] Zone ranges:
+[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Normal empty
+[ 0.000000] Movable zone start for each node
+[ 0.000000] Early memory node ranges
+[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] riscv: ISA extensions acdfim
+[ 0.000000] riscv: ELF capabilities acdfim
+[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0
+[ 0.000000] percpu: Embedded 11 pages/cpu s15392 r0 d29664 u45056
+[ 0.000000] percpu: wasting 10 pages per chunk
+[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020
+[ 0.000000] Kernel command line: earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro
+[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear)
+[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
+[ 0.000000] Memory: 6156K/8192K available (1180K kernel code, 151K rwdata, 239K rodata, 102K init, 69K bss, 2036K reserved, 0K cma-reserved)
+[ 0.000000] rcu: Hierarchical RCU implementation.
+[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies.
+[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0
+[ 0.000000] riscv-intc: 64 local interrupts mapped
+[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts.
+[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz
+[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz
+[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns
+[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns
+[ 0.008196] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200)
+[ 0.018256] pid_max: default: 4096 minimum: 301
+[ 0.022876] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.029980] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.040401] rcu: Hierarchical SRCU implementation.
+[ 0.045379] smp: Bringing up secondary CPUs ...
+[ 0.050494] smp: Brought up 1 node, 2 CPUs
+[ 0.054656] devtmpfs: initialized
+[ 0.072338] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns
+[ 0.081415] pinctrl core: initialized pinctrl subsystem
+[ 0.123902] clocksource: Switched to clocksource clint_clocksource
+[ 0.136898] workingset: timestamp_bits=62 max_order=11 bucket_order=0
+[ 0.182570] k210-sysctl 50440000.syscon: K210 system controller
+[ 0.198158] k210-rst 50440000.syscon:reset-controller: K210 reset controller
+[ 0.207473] cacheinfo: Unable to detect cache hierarchy for CPU 0
+[ 0.219724] i2c_dev: i2c /dev entries driver
+[ 0.230080] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller
+[ 0.243091] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0
+[ 0.252034] printk: console [ttySIF0] enabled
+[ 0.252034] printk: console [ttySIF0] enabled
+[ 0.260656] printk: bootconsole [sifive0] disabled
+[ 0.260656] printk: bootconsole [sifive0] disabled
+[ 0.272546] panel@0 enforce active low on chipselect handle
+[ 0.308098] mmc_spi spi3.0: SD/MMC host mmc0, no WP, no poweroff, cd polling
+[ 0.320197] Waiting for root device /dev/mmcblk0p2...
+[ 0.344667] mmc0: host does not support reading read-only switch, assuming write-enable
+[ 0.352020] mmc0: new SDHC card on SPI
+[ 0.358566] mmcblk0: mmc0:0000 SA16G 14.5 GiB
+[ 0.366866] random: fast init done
+[ 0.371439] mmcblk0: p1 p2
+[ 0.391314] random: get_random_bytes called from 0x000000008009b7d2 with crng_init=1
+[ 0.400977] VFS: Mounted root (ext2 filesystem) readonly on device 179:2.
+[ 0.410966] devtmpfs: mounted
+[ 0.413521] Freeing unused kernel image (initmem) memory: 96K
+[ 0.418944] This architecture does not have kernel memory protection.
+[ 0.425370] Run /sbin/init as init process
+[ 0.633502] random: crng init done
+ __ _
+ / / (_) ____ _ _ __ __
+ / / | || _ \ | | | |\ \/ /
+ / /___| || | | || |_| | > <
+ /_____/|_||_| |_| \____|/_/\_\
+ 64-bits RISC-V Kendryte K210 NOMMU
+
+/ #
+```
+
+Of note is that the kernel mounts the SD card as read-only by default to avoid
+corruptions of the ext2 root file system when the board is powered down. This
+is recommended as this board does not support clean shutdown or halt.
+
+Similarly to the initramfs build case, a console can be open without
+re-flashing the board using the host tool pyserial-miniterm.
+
+```
+$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200
+```
diff --git a/configs/sipeed_maix_dock_defconfig b/configs/sipeed_maix_dock_defconfig
new file mode 100644
index 0000000000..4be41e80ec
--- /dev/null
+++ b/configs/sipeed_maix_dock_defconfig
@@ -0,0 +1,38 @@
+# Architecture
+BR2_riscv=y
+BR2_RISCV_64=y
+BR2_riscv_custom=y
+BR2_RISCV_ISA_CUSTOM_RVM=y
+BR2_RISCV_ISA_CUSTOM_RVA=y
+BR2_RISCV_ISA_CUSTOM_RVF=y
+BR2_RISCV_ISA_CUSTOM_RVD=y
+BR2_RISCV_ISA_CUSTOM_RVC=y
+BR2_RISCV_ABI_LP64D=y
+
+# Binary format
+# BR2_USE_MMU is not set
+BR2_BINFMT_FLAT=y
+BR2_BINFMT_FLAT_ONE=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_PATCH="board/riscv/nommu/kernel_patches"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.18"
+BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/maix-dock/linux-cpio.config"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin"
+
+# Packages
+BR2_PACKAGE_HOST_ELF2FLT=y
+BR2_PACKAGE_HOST_PYTHON_KFLASH=y
+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config"
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+
+# Filesystem
+BR2_INIT_NONE=y
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
diff --git a/configs/sipeed_maix_dock_sdcard_defconfig b/configs/sipeed_maix_dock_sdcard_defconfig
new file mode 100644
index 0000000000..f235c720b3
--- /dev/null
+++ b/configs/sipeed_maix_dock_sdcard_defconfig
@@ -0,0 +1,56 @@
+# Architecture
+BR2_riscv=y
+BR2_RISCV_64=y
+BR2_riscv_custom=y
+BR2_RISCV_ISA_CUSTOM_RVM=y
+BR2_RISCV_ISA_CUSTOM_RVA=y
+BR2_RISCV_ISA_CUSTOM_RVF=y
+BR2_RISCV_ISA_CUSTOM_RVD=y
+BR2_RISCV_ISA_CUSTOM_RVC=y
+BR2_RISCV_ABI_LP64D=y
+
+# System
+# BR2_USE_MMU is not set
+BR2_BINFMT_FLAT=y
+BR2_BINFMT_FLAT_ONE=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_PATCH="board/riscv/nommu/kernel_patches"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.18"
+BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210_sdcard"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/linux-sdcard.config"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_dock"
+
+# Packages
+BR2_PACKAGE_HOST_ELF2FLT=y
+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+
+# Filesystem
+BR2_INIT_NONE=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_SIZE=64M
+BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/canaan/k210-soc/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/canaan/k210-soc/genimage.cfg"
+
+# Bootloader and related host tools
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sipeed_maix_bitm"
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_PYTHON_KFLASH=y
--
2.36.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v2 10/11] board: Add Sipeed MAIX-Go board support
2022-05-30 3:38 [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Damien Le Moal via buildroot
` (8 preceding siblings ...)
2022-05-30 3:38 ` [Buildroot] [PATCH v2 09/11] board: Add Sipeed MAIX-Dock " Damien Le Moal via buildroot
@ 2022-05-30 3:38 ` Damien Le Moal via buildroot
2022-05-30 3:38 ` [Buildroot] [PATCH v2 11/11] board: Add Canaan KD233 " Damien Le Moal via buildroot
2022-05-30 10:19 ` [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Waldemar Brodkorb
11 siblings, 0 replies; 23+ messages in thread
From: Damien Le Moal via buildroot @ 2022-05-30 3:38 UTC (permalink / raw)
To: buildroot, Thomas Petazzoni
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN
Add two buildroot configuration files to build a minimal Linux
environment for the Sipeed MAIX Bit board. The configurations are:
* sipeed_maix_go_defconfig: Build a bootable kernel image with an
embedded initramfs root file system. The image built can be flashed to
the board as is and does not require a boot loader. This configuration
uses the tiny busybox configuration defined in
board/canaan/k210-soc/busybox-tiny.config.
* sipeed_maix_go_sdcard_defconfig: Build a kernel image with a root
file system on the SD card and using U-Boot as the boot loader. This
uses the default busybox minimal configuration.
Both configurations also enable the kflash and pyserial-miniterm host
tools for flashing image files to the board and opening a terminal
console.
The readme.txt file documents how to build and boot the Sipeed MAIX-Go
board with these configurations.
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
DEVELOPERS | 2 +
board/sipeed/maix-go/linux-cpio.config | 2 +
board/sipeed/maix-go/readme.txt | 320 ++++++++++++++++++++++++
configs/sipeed_maix_go_defconfig | 38 +++
configs/sipeed_maix_go_sdcard_defconfig | 56 +++++
5 files changed, 418 insertions(+)
create mode 100644 board/sipeed/maix-go/linux-cpio.config
create mode 100644 board/sipeed/maix-go/readme.txt
create mode 100644 configs/sipeed_maix_go_defconfig
create mode 100644 configs/sipeed_maix_go_sdcard_defconfig
diff --git a/DEVELOPERS b/DEVELOPERS
index 493699ce13..6cbb8f44fd 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -637,6 +637,8 @@ F: configs/sipeed_maixduino_defconfig
F: configs/sipeed_maixduino_sdcard_defconfig
F: configs/sipeed_maix_dock_defconfig
F: configs/sipeed_maix_dock_sdcard_defconfig
+F: configs/sipeed_maix_go_defconfig
+F: configs/sipeed_maix_go_sdcard_defconfig
N: Daniel Nicoletti <dantti12@gmail.com>
F: package/cutelyst/
diff --git a/board/sipeed/maix-go/linux-cpio.config b/board/sipeed/maix-go/linux-cpio.config
new file mode 100644
index 0000000000..ea8c30e266
--- /dev/null
+++ b/board/sipeed/maix-go/linux-cpio.config
@@ -0,0 +1,2 @@
+CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y
+CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maix_go"
diff --git a/board/sipeed/maix-go/readme.txt b/board/sipeed/maix-go/readme.txt
new file mode 100644
index 0000000000..bf0654fc70
--- /dev/null
+++ b/board/sipeed/maix-go/readme.txt
@@ -0,0 +1,320 @@
+Sipeed MAIX-Go Board
+====================
+
+The Sipeed MAXI-Go board is a dual-core RISC-V 64-bits board based on the
+Canaan Kendryte K210 SoC.
+
+Prerequisite
+------------
+
+In order to use the kflash utility to program this board, the user must have
+access to the board USB serial device file. The simplest way to do this is to
+add your user to the same group as this device file. Assume the device file is
+/dev/ttyUSB0, first identify the device group name. In most cases, it is
+either "dialout" or "uucp". Also verify that read-write access is enabled for
+the group:
+
+```
+$ ls -l /dev/ttyUSB0
+crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0
+```
+
+Then add yourself to that group (dialout in this example):
+
+```
+$ sudo usermod -a -G dialout $(whoami)
+```
+
+To enable the above, it is sometimes necessary to logout and login again.
+
+Buildroot Configuration
+-----------------------
+
+Two buildroot configuration files are provided:
+
+(1) Direct Linux Kernel Boot
+
+This is defined by the sipeed_maix_go_defconfig configuration. This
+configuration allows building a bootable kernel image with a built-in initramfs
+root file system (the board SD card is not used). The built kernel image can be
+flashed directly to the board ROM for direct booting. No boot loader is
+required.
+
+(2) U-Boot SD-Card Boot
+
+The sipeed_maix_go_sdcard_defconfig configuration allows building a kernel
+image with the root file system on the board SD card. U-Boot is used as the
+boot loader.
+
+Note: U-Boot does not natively support the Sipeed MAIX-Go board. However, the
+board and device tree differences with the Sipeed MAIX-bit board are small
+enough for U-Boot to work.
+
+Both configuration files will also compile and install the kflash and
+pyserial-miniterm host utilities to program bootable image files to the board
+and open a serial terminal console.
+
+Direct Linux Kernel Boot
+-------------------------
+
+Using the sipeed_maix_go_defconfig configuration, the bootable kernel binary
+image is built as follows.
+
+```
+$ make sipeed_maix_go_defconfig
+$ make
+```
+
+The bootable binary image is the output/images/loader.bin file. This image file
+can be written to the board boot flash using the kflash utility.
+
+```
+$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin
+```
+
+Once the kernel image file is fully programmed, a terminal console is open and
+the board can be rebooted by pressing the reset button on the board (if it does
+not reboot automatically).
+
+The output will be similar to the following.
+
+```
+[ 0.000000] Linux version 5.17.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 16:09:24 JST 2022
+[ 0.000000] Machine model: SiPeed MAIX GO
+[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8')
+[ 0.000000] printk: bootconsole [sifive0] enabled
+[ 0.000000] Zone ranges:
+[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Normal empty
+[ 0.000000] Movable zone start for each node
+[ 0.000000] Early memory node ranges
+[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] riscv: ISA extensions acdfim
+[ 0.000000] riscv: ELF capabilities acdfim
+[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0
+[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056
+[ 0.000000] percpu: wasting 10 pages per chunk
+[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020
+[ 0.000000] Kernel command line: earlycon console=ttySIF0
+[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear)
+[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
+[ 0.000000] Memory: 5980K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 546K init, 66K bss, 2212K reserved, 0K cma-reserved)
+[ 0.000000] rcu: Hierarchical RCU implementation.
+[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies.
+[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0
+[ 0.000000] riscv-intc: 64 local interrupts mapped
+[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts.
+[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz
+[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz
+[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns
+[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns
+[ 0.008193] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200)
+[ 0.018250] pid_max: default: 4096 minimum: 301
+[ 0.022862] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.029971] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.040239] rcu: Hierarchical SRCU implementation.
+[ 0.045118] smp: Bringing up secondary CPUs ...
+[ 0.050204] smp: Brought up 1 node, 2 CPUs
+[ 0.054336] devtmpfs: initialized
+[ 0.071519] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns
+[ 0.080591] pinctrl core: initialized pinctrl subsystem
+[ 0.121163] clocksource: Switched to clocksource clint_clocksource
+[ 0.133221] workingset: timestamp_bits=62 max_order=11 bucket_order=0
+[ 0.180960] k210-sysctl 50440000.syscon: K210 system controller
+[ 0.196811] k210-rst 50440000.syscon:reset-controller: K210 reset controller
+[ 0.204879] cacheinfo: Unable to detect cache hierarchy for CPU 0
+[ 0.214087] i2c_dev: i2c /dev entries driver
+[ 0.222736] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller
+[ 0.236173] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0
+[ 0.245104] printk: console [ttySIF0] enabled
+[ 0.245104] printk: console [ttySIF0] enabled
+[ 0.253726] printk: bootconsole [sifive0] disabled
+[ 0.253726] printk: bootconsole [sifive0] disabled
+[ 0.265588] panel@0 enforce active low on chipselect handle
+[ 0.282358] Freeing unused kernel image (initmem) memory: 540K
+[ 0.287492] This architecture does not have kernel memory protection.
+[ 0.293926] Run /init as init process
+ __ _
+ / / (_) ____ _ _ __ __
+ / / | || _ \ | | | |\ \/ /
+ / /___| || | | || |_| | > <
+ /_____/|_||_| |_| \____|/_/\_\
+ 64-bits RISC-V Kendryte K210 NOMMU
+
+/ #
+```
+
+To open a terminal console without re-flashing the board, the pyserial-miniterm
+host tool can be used.
+
+```
+$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200
+```
+
+The options "--raw" and "--eol=LF" are added here to avoid a double carriage
+return each time a command is entered.
+
+
+U-Boot SD-Card Boot
+-------------------
+
+The build procedure is similar to the built-in initramfs case.
+
+```
+$ make sipeed_maix_go_sdcard_defconfig
+$ make
+```
+
+The build process will generate two files under the output/images directory.
+
+* sdcard.img: The image file for the SD card filesystem. This image has 2
+ partitions. The first partition is a vfat partition containing the kernel
+ uImage and the board device tree binary. The second partition is the root
+ filesystem with busybox installed. The second partition is formatted using
+ ext2 (rev1).
+
+* uboot.bin: U-Boot bootable binary to load and boot the kernel from the SD
+ card.
+
+The SD card can be prepared by writing the sdcard.img file, as follows.
+
+```
+$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M
+$ sync
+$ eject /dev/sdX
+```
+
+Where /dev/sdX is the device file name of the SD card. Once completed, the SD
+card can be inserted into the board and the U-Boot binary image written to the
+board boot flash using the kflash utility.
+
+```
+$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/u-boot.bin
+```
+
+The above command will program U-Boot image to the board boot ROM and open a
+terminal console once the u-boot.bin file is fully programmed. Reboot into the
+newly programmed environment by pressing the board reset button.
+
+The output will be similar to the following.
+
+```
+U-Boot 2022.04 (Apr 21 2022 - 16:28:58 +0900)
+
+DRAM: 8 MiB
+Core: 34 devices, 17 uclasses, devicetree: separate
+WDT: Not starting watchdog@50400000
+MMC: spi@53000000:slot@0: 0
+Loading Environment from SPIFlash... SF: Detected gd25lq128 with page size 256 Bytes, erase size 4 KiB, total 16 MiB
+*** Warning - bad CRC, using default environment
+
+In: serial@38000000
+Out: serial@38000000
+Err: serial@38000000
+Hit any key to stop autoboot: 0
+1717730 bytes read in 956 ms (1.7 MiB/s)
+10502 bytes read in 11 ms (931.6 KiB/s)
+## Booting kernel from Legacy Image at 80060000 ...
+ Image Name: Linux
+ Image Type: RISC-V Linux Kernel Image (uncompressed)
+ Data Size: 1717666 Bytes = 1.6 MiB
+ Load Address: 80000000
+ Entry Point: 80000000
+ Verifying Checksum ... OK
+## Flattened Device Tree blob at 80400000
+ Booting using the fdt blob at 0x80400000
+ Loading Kernel Image
+ Loading Device Tree to 00000000803fa000, end 00000000803ff905 ... OK
+
+Starting kernel ...
+
+[ 0.000000] Linux version 5.17.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #1 SMP Thu Apr 21 16:29:10 JST 2022
+[ 0.000000] Machine model: SiPeed MAIX GO
+[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8')
+[ 0.000000] printk: bootconsole [sifive0] enabled
+[ 0.000000] Zone ranges:
+[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Normal empty
+[ 0.000000] Movable zone start for each node
+[ 0.000000] Early memory node ranges
+[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] riscv: ISA extensions acdfim
+[ 0.000000] riscv: ELF capabilities acdfim
+[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0
+[ 0.000000] percpu: Embedded 11 pages/cpu s15392 r0 d29664 u45056
+[ 0.000000] percpu: wasting 10 pages per chunk
+[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020
+[ 0.000000] Kernel command line: earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro
+[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear)
+[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
+[ 0.000000] Memory: 6156K/8192K available (1180K kernel code, 151K rwdata, 239K rodata, 102K init, 69K bss, 2036K reserved, 0K cma-reserved)
+[ 0.000000] rcu: Hierarchical RCU implementation.
+[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies.
+[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0
+[ 0.000000] riscv-intc: 64 local interrupts mapped
+[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts.
+[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz
+[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz
+[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns
+[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns
+[ 0.008201] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200)
+[ 0.018256] pid_max: default: 4096 minimum: 301
+[ 0.022875] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.029983] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.040405] rcu: Hierarchical SRCU implementation.
+[ 0.045387] smp: Bringing up secondary CPUs ...
+[ 0.050501] smp: Brought up 1 node, 2 CPUs
+[ 0.054662] devtmpfs: initialized
+[ 0.072840] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns
+[ 0.081918] pinctrl core: initialized pinctrl subsystem
+[ 0.124601] clocksource: Switched to clocksource clint_clocksource
+[ 0.137869] workingset: timestamp_bits=62 max_order=11 bucket_order=0
+[ 0.183507] k210-sysctl 50440000.syscon: K210 system controller
+[ 0.199987] k210-rst 50440000.syscon:reset-controller: K210 reset controller
+[ 0.209219] cacheinfo: Unable to detect cache hierarchy for CPU 0
+[ 0.221062] i2c_dev: i2c /dev entries driver
+[ 0.232254] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller
+[ 0.245342] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0
+[ 0.254281] printk: console [ttySIF0] enabled
+[ 0.254281] printk: console [ttySIF0] enabled
+[ 0.262908] printk: bootconsole [sifive0] disabled
+[ 0.262908] printk: bootconsole [sifive0] disabled
+[ 0.274939] panel@0 enforce active low on chipselect handle
+[ 0.308760] mmc_spi spi3.0: SD/MMC host mmc0, no WP, no poweroff, cd polling
+[ 0.321220] Waiting for root device /dev/mmcblk0p2...
+[ 0.344805] mmc0: host does not support reading read-only switch, assuming write-enable
+[ 0.352142] mmc0: new SDHC card on SPI
+[ 0.358622] mmcblk0: mmc0:0000 SA16G 14.5 GiB
+[ 0.366636] random: fast init done
+[ 0.371323] mmcblk0: p1 p2
+[ 0.392887] random: get_random_bytes called from 0x000000008009b7d2 with crng_init=1
+[ 0.394338] VFS: Mounted root (ext2 filesystem) readonly on device 179:2.
+[ 0.411277] devtmpfs: mounted
+[ 0.413836] Freeing unused kernel image (initmem) memory: 96K
+[ 0.419267] This architecture does not have kernel memory protection.
+[ 0.425683] Run /sbin/init as init process
+[ 0.594251] random: crng init done
+ __ _
+ / / (_) ____ _ _ __ __
+ / / | || _ \ | | | |\ \/ /
+ / /___| || | | || |_| | > <
+ /_____/|_||_| |_| \____|/_/\_\
+ 64-bits RISC-V Kendryte K210 NOMMU
+
+/ #
+```
+
+Of note is that the kernel mounts the SD card as read-only by default to avoid
+corruptions of the ext2 root file system when the board is powered down. This
+is recommended as this board does not support clean shutdown or halt.
+
+Similarly to the initramfs build case, a console can be open without
+re-flashing the board using the host tool pyserial-miniterm.
+
+```
+$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200
+```
diff --git a/configs/sipeed_maix_go_defconfig b/configs/sipeed_maix_go_defconfig
new file mode 100644
index 0000000000..29c9a1e19d
--- /dev/null
+++ b/configs/sipeed_maix_go_defconfig
@@ -0,0 +1,38 @@
+# Architecture
+BR2_riscv=y
+BR2_RISCV_64=y
+BR2_riscv_custom=y
+BR2_RISCV_ISA_CUSTOM_RVM=y
+BR2_RISCV_ISA_CUSTOM_RVA=y
+BR2_RISCV_ISA_CUSTOM_RVF=y
+BR2_RISCV_ISA_CUSTOM_RVD=y
+BR2_RISCV_ISA_CUSTOM_RVC=y
+BR2_RISCV_ABI_LP64D=y
+
+# Binary format
+# BR2_USE_MMU is not set
+BR2_BINFMT_FLAT=y
+BR2_BINFMT_FLAT_ONE=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_PATCH="board/riscv/nommu/kernel_patches"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.18"
+BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/maix-go/linux-cpio.config"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin"
+
+# Packages
+BR2_PACKAGE_HOST_ELF2FLT=y
+BR2_PACKAGE_HOST_PYTHON_KFLASH=y
+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config"
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+
+# Filesystem
+BR2_INIT_NONE=y
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
diff --git a/configs/sipeed_maix_go_sdcard_defconfig b/configs/sipeed_maix_go_sdcard_defconfig
new file mode 100644
index 0000000000..01764df411
--- /dev/null
+++ b/configs/sipeed_maix_go_sdcard_defconfig
@@ -0,0 +1,56 @@
+# Architecture
+BR2_riscv=y
+BR2_RISCV_64=y
+BR2_riscv_custom=y
+BR2_RISCV_ISA_CUSTOM_RVM=y
+BR2_RISCV_ISA_CUSTOM_RVA=y
+BR2_RISCV_ISA_CUSTOM_RVF=y
+BR2_RISCV_ISA_CUSTOM_RVD=y
+BR2_RISCV_ISA_CUSTOM_RVC=y
+BR2_RISCV_ABI_LP64D=y
+
+# System
+# BR2_USE_MMU is not set
+BR2_BINFMT_FLAT=y
+BR2_BINFMT_FLAT_ONE=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_PATCH="board/riscv/nommu/kernel_patches"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.18"
+BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210_sdcard"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/linux-sdcard.config"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_go"
+
+# Packages
+BR2_PACKAGE_HOST_ELF2FLT=y
+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+
+# Filesystem
+BR2_INIT_NONE=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_SIZE=64M
+BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/canaan/k210-soc/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/canaan/k210-soc/genimage.cfg"
+
+# Bootloader and related host tools
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sipeed_maix_bitm"
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_PYTHON_KFLASH=y
--
2.36.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH v2 11/11] board: Add Canaan KD233 board support
2022-05-30 3:38 [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Damien Le Moal via buildroot
` (9 preceding siblings ...)
2022-05-30 3:38 ` [Buildroot] [PATCH v2 10/11] board: Add Sipeed MAIX-Go " Damien Le Moal via buildroot
@ 2022-05-30 3:38 ` Damien Le Moal via buildroot
2022-05-30 10:19 ` [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Waldemar Brodkorb
11 siblings, 0 replies; 23+ messages in thread
From: Damien Le Moal via buildroot @ 2022-05-30 3:38 UTC (permalink / raw)
To: buildroot, Thomas Petazzoni
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN
Add a buildroot configuration file to build a minimal Linux environment
for the Sipeed MAIX Bit board.
The configuration file is canaan_kd233_defconfig. It builds a bootable
kernel image with an embedded initramfs root file system. The image
built can be flashed to the board as is and does not require a boot
loader. This configuration uses the tiny busybox configuration defined
in board/canaan/k210-soc/busybox-tiny.config.
U-Boot currently does not support this board, making it impossible to
boot the kernel after loading it from the SD card. However, the SD card
is usable from Linux once booted using the canaan_kd233_defconfig
configuration.
The configuration also enable the kflash and pyserial-miniterm host
tools for flashing image files to the board and opening a terminal
console.
The readme.txt file documents how to build and boot the Canaan KD233
board with this configuration.
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
DEVELOPERS | 1 +
board/canaan/kd233/linux-cpio.config | 2 +
board/canaan/kd233/readme.txt | 149 +++++++++++++++++++++++++++
configs/canaan_kd233_defconfig | 38 +++++++
4 files changed, 190 insertions(+)
create mode 100644 board/canaan/kd233/linux-cpio.config
create mode 100644 board/canaan/kd233/readme.txt
create mode 100644 configs/canaan_kd233_defconfig
diff --git a/DEVELOPERS b/DEVELOPERS
index 6cbb8f44fd..b4e8eb470b 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -630,6 +630,7 @@ F: package/log4cpp/
N: Damien Le Moal <damien.lemoal@wdc.com>
F: package/python-kflash/
F: board/canaan/
+F: configs/canaan_kd233_defconfig
F: board/sipeed/
F: configs/sipeed_maix_bit_defconfig
F: configs/sipeed_maix_bit_sdcard_defconfig
diff --git a/board/canaan/kd233/linux-cpio.config b/board/canaan/kd233/linux-cpio.config
new file mode 100644
index 0000000000..d5b107124a
--- /dev/null
+++ b/board/canaan/kd233/linux-cpio.config
@@ -0,0 +1,2 @@
+CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y
+CONFIG_SOC_CANAAN_K210_DTB_SOURCE="canaan_kd233"
diff --git a/board/canaan/kd233/readme.txt b/board/canaan/kd233/readme.txt
new file mode 100644
index 0000000000..47b78fa2d7
--- /dev/null
+++ b/board/canaan/kd233/readme.txt
@@ -0,0 +1,149 @@
+Canaan KD233 Board
+==================
+
+The Canaan KD233 is a dual-core RISC-V 64-bits board based on the Canaan
+Kendryte K210 SoC.
+
+Prerequisite
+------------
+
+In order to use the kflash utility to program this board, the user must have
+access to the board USB serial device file. The simplest way to do this is to
+add your user to the same group as this device file. Assume the device file is
+/dev/ttyUSB0, first identify the device group name. In most cases, it is
+either "dialout" or "uucp". Also verify that read-write access is enabled for
+the group:
+
+```
+$ ls -l /dev/ttyUSB0
+crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0
+```
+
+Then add yourself to that group (dialout in this example):
+
+```
+$ sudo usermod -a -G dialout $(whoami)
+```
+
+To enable the above, it is sometimes necessary to logout and login again.
+
+Buildroot Configuration
+-----------------------
+
+Unlike other K210 based boards (Sipeed boards), U-Boot does not work on the
+KD233 board due to the different wiring for the SD-Card mmc controller. As such,
+the KD233 board can only be used by directly booting into Linux Kernel.
+
+buildroot can be configured to do so using the canaan_kd233_defconfig
+configuration file. This configuration allows building a bootable kernel image
+with a built-in initramfs root file system (the board SD card is not used). The
+built kernel image can be flashed directly to the board ROM for direct booting.
+No boot loader is required.
+
+Once booted, the on-board SD card can be used by Linux.
+
+The configuration file will also compile and install the kflash and
+pyserial-miniterm host utilities to program bootable image files to the board
+and open a serial terminal console.
+
+Direct Linux Kernel Boot
+-------------------------
+
+Using the canaan_kd233_defconfig configuration, the bootable kernel binary image
+is built as follows.
+
+```
+$ make canaan_kd233_defconfig
+$ make
+```
+
+The bootable binary image is the output/images/loader.bin file. This image file
+can be written to the board boot flash using the kflash utility.
+
+```
+$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin
+```
+
+Once the kernel image file is fully programmed, a terminal console is open and
+the board can be rebooted by pressing the reset button on the board (if it does
+not reboot automatically).
+
+The output will be similar to the following.
+
+```
+[ 0.000000] Linux version 5.17.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 16:40:44 JST 2022
+[ 0.000000] Machine model: Kendryte KD233
+[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8')
+[ 0.000000] printk: bootconsole [sifive0] enabled
+[ 0.000000] Zone ranges:
+[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Normal empty
+[ 0.000000] Movable zone start for each node
+[ 0.000000] Early memory node ranges
+[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff]
+[ 0.000000] riscv: ISA extensions acdfim
+[ 0.000000] riscv: ELF capabilities acdfim
+[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0
+[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056
+[ 0.000000] percpu: wasting 10 pages per chunk
+[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020
+[ 0.000000] Kernel command line: earlycon console=ttySIF0
+[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear)
+[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
+[ 0.000000] Memory: 5984K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 546K init, 66K bss, 2208K reserved, 0K cma-reserved)
+[ 0.000000] rcu: Hierarchical RCU implementation.
+[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies.
+[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0
+[ 0.000000] riscv-intc: 64 local interrupts mapped
+[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts.
+[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz
+[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz
+[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns
+[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns
+[ 0.008178] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200)
+[ 0.018251] pid_max: default: 4096 minimum: 301
+[ 0.022861] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.029971] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
+[ 0.040234] rcu: Hierarchical SRCU implementation.
+[ 0.045110] smp: Bringing up secondary CPUs ...
+[ 0.050211] smp: Brought up 1 node, 2 CPUs
+[ 0.054340] devtmpfs: initialized
+[ 0.070401] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns
+[ 0.079473] pinctrl core: initialized pinctrl subsystem
+[ 0.117795] clocksource: Switched to clocksource clint_clocksource
+[ 0.130245] workingset: timestamp_bits=62 max_order=11 bucket_order=0
+[ 0.176925] k210-sysctl 50440000.syscon: K210 system controller
+[ 0.192947] k210-rst 50440000.syscon:reset-controller: K210 reset controller
+[ 0.200870] cacheinfo: Unable to detect cache hierarchy for CPU 0
+[ 0.210947] i2c_dev: i2c /dev entries driver
+[ 0.220535] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller
+[ 0.232253] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0
+[ 0.241202] printk: console [ttySIF0] enabled
+[ 0.241202] printk: console [ttySIF0] enabled
+[ 0.249818] printk: bootconsole [sifive0] disabled
+[ 0.249818] printk: bootconsole [sifive0] disabled
+[ 0.261664] panel@0 enforce active low on chipselect handle
+[ 0.275950] Freeing unused kernel image (initmem) memory: 540K
+[ 0.281098] This architecture does not have kernel memory protection.
+[ 0.287520] Run /init as init process
+ __ _
+ / / (_) ____ _ _ __ __
+ / / | || _ \ | | | |\ \/ /
+ / /___| || | | || |_| | > <
+ /_____/|_||_| |_| \____|/_/\_\
+ 64-bits RISC-V Kendryte K210 NOMMU
+
+/ #
+```
+
+To open a terminal console without re-flashing the board, the pyserial-miniterm
+host tool can be used.
+
+```
+$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200
+```
+
+The options "--raw" and "--eol=LF" are added here to avoid a double carriage
+return each time a command is entered.
diff --git a/configs/canaan_kd233_defconfig b/configs/canaan_kd233_defconfig
new file mode 100644
index 0000000000..ad398abe73
--- /dev/null
+++ b/configs/canaan_kd233_defconfig
@@ -0,0 +1,38 @@
+# Architecture
+BR2_riscv=y
+BR2_RISCV_64=y
+BR2_riscv_custom=y
+BR2_RISCV_ISA_CUSTOM_RVM=y
+BR2_RISCV_ISA_CUSTOM_RVA=y
+BR2_RISCV_ISA_CUSTOM_RVF=y
+BR2_RISCV_ISA_CUSTOM_RVD=y
+BR2_RISCV_ISA_CUSTOM_RVC=y
+BR2_RISCV_ABI_LP64D=y
+
+# Binary format
+# BR2_USE_MMU is not set
+BR2_BINFMT_FLAT=y
+BR2_BINFMT_FLAT_ONE=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_PATCH="board/riscv/nommu/kernel_patches"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.18"
+BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/kd233/linux-cpio.config"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin"
+
+# Packages
+BR2_PACKAGE_HOST_ELF2FLT=y
+BR2_PACKAGE_HOST_PYTHON_KFLASH=y
+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config"
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+
+# Filesystem
+BR2_INIT_NONE=y
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay"
--
2.36.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support
2022-05-30 3:38 [Buildroot] [PATCH v2 00/11] Fix RV64 NOMMU and add Canaan K210 SoC support Damien Le Moal via buildroot
` (10 preceding siblings ...)
2022-05-30 3:38 ` [Buildroot] [PATCH v2 11/11] board: Add Canaan KD233 " Damien Le Moal via buildroot
@ 2022-05-30 10:19 ` Waldemar Brodkorb
11 siblings, 0 replies; 23+ messages in thread
From: Waldemar Brodkorb @ 2022-05-30 10:19 UTC (permalink / raw)
To: Damien Le Moal
Cc: Niklas Cassel, Alistair Francis, Yann E . MORIN, Thomas Petazzoni,
buildroot
Hi,
tested on a Sipeed Maix-Bit board.
Tested-By: Waldemar Brodkorb <wbx@openadk.org>
Damien Le Moal via buildroot wrote,
> This patch series is a rework of the old v5 series "Add RV64 NOMMU and
> Canaan K210 SoC support" already posted some (long) time ago.
>
> This series adds support for building 64-bits RISC-V NOMMU kernels (both
> bootable kernels and u-boot sdcard boot envronements) for NOMMU RISC-V
> 64-bits boards. The board supported include QEMU and many boards using
> the dual-core RISC-V 64-bits Cannan Kendryte K210 SoC.
>
> The first patch is a simple fix of elf2flt configuration menu entry.
> The second patch fixes the existing elf2flt RISC-V 64-bits support.
>
> The third patch adds a Linux kernel patch that must be used for all
> NOMMU RISC-V builds. This patch will be present in the upcoming 5.19
> kernel.
>
> Patch 4 adds a buildroot configuration file for QEMU NOMMU RISC-V
> 64-bits builds.
>
> Patch 5 adds the python-kflash utility as a host package to allow users
> to program their K210-based boards with bootable images. This patch also
> modifies the python-serial package to add its host package definition to
> make the python-miniterm utility available to users to open serial
> consoles with their K210-based boards.
>
> Patch 6 adds the configurations files common to all K210-based boards.
>
> Finally, the last 5 patches add support for the following K210-based
> boards:
> * Sipeed MAIX Bit
> * Sipeed MAIXDUINO
> * Sipeed MAIX Dock (dan)
> * Sipeed MAIX Go
> * Canaan KD233 development board
>
> For each board, a readme.txt file is added to document how to build and
> install images for these
> boards.
best regards
Waldemar
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 23+ messages in thread