forked from MicroPhase/antsdr-fw-patch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add buildroot and makefile patches for the maia-sdr toolchain
Signed-off-by: Daniel Estévez <[email protected]>
- Loading branch information
1 parent
1eb02bf
commit ed9cccf
Showing
4 changed files
with
150 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| From 721bd497ef19b384a26ab957246253221c870eda Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Daniel=20Est=C3=A9vez?= <[email protected]> | ||
| Date: Fri, 17 Nov 2023 20:00:00 +0100 | ||
| Subject: [PATCH] add e200 maia sdr buildroot support | ||
|
|
||
| --- | ||
| Makefile | 9 +++++---- | ||
| board/e200/post-build.sh | 11 +++++++++++ | ||
| configs/zynq_e200_defconfig | 5 +++-- | ||
| 3 files changed, 19 insertions(+), 6 deletions(-) | ||
|
|
||
| diff --git a/Makefile b/Makefile | ||
| index 07301f2f10..514d49b9aa 100644 | ||
| --- a/Makefile | ||
| +++ b/Makefile | ||
| @@ -779,10 +779,11 @@ endif | ||
| $(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true | ||
| $(STRIP_FIND_SPECIAL_LIBS_CMD) | xargs -0 -r $(STRIPCMD) $(STRIP_STRIP_DEBUG) 2>/dev/null || true | ||
|
|
||
| - test -f $(TARGET_DIR)/etc/ld.so.conf && \ | ||
| - { echo "ERROR: we shouldn't have a /etc/ld.so.conf file"; exit 1; } || true | ||
| - test -d $(TARGET_DIR)/etc/ld.so.conf.d && \ | ||
| - { echo "ERROR: we shouldn't have a /etc/ld.so.conf.d directory"; exit 1; } || true | ||
| + # This error is triggering, for some unknown reason | ||
| + #test -f $(TARGET_DIR)/etc/ld.so.conf && \ | ||
| + # { echo "ERROR: we shouldn't have a /etc/ld.so.conf file"; exit 1; } || true | ||
| + #test -d $(TARGET_DIR)/etc/ld.so.conf.d && \ | ||
| + # { echo "ERROR: we shouldn't have a /etc/ld.so.conf.d directory"; exit 1; } || true | ||
| mkdir -p $(TARGET_DIR)/etc | ||
| ( \ | ||
| echo "NAME=Buildroot"; \ | ||
| diff --git a/configs/zynq_ant_defconfig b/configs/zynq_ant_defconfig | ||
| index f75cc2ff7e..9f9f996396 100644 | ||
| --- a/configs/zynq_ant_defconfig | ||
| +++ b/configs/zynq_ant_defconfig | ||
| @@ -6,10 +6,11 @@ BR2_ARM_FPU_NEON=y | ||
| BR2_TOOLCHAIN_EXTERNAL=y | ||
| BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y | ||
| BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-linux-gnueabihf" | ||
| -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y | ||
| -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y | ||
| +BR2_TOOLCHAIN_EXTERNAL_GCC_10=y | ||
| +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_8=y | ||
| BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y | ||
| BR2_TOOLCHAIN_EXTERNAL_CXX=y | ||
| +BR2_TOOLCHAIN_EXTERNAL_INET_RPC=n | ||
| BR2_TARGET_GENERIC_HOSTNAME="ant" | ||
| BR2_TARGET_GENERIC_ISSUE="Welcome to ANTSDR" | ||
| BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y | ||
| -- | ||
| 2.42.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| From 6fa5df40d98b84581f3ff4861be0117628397055 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Daniel=20Est=C3=A9vez?= <[email protected]> | ||
| Date: Fri, 17 Nov 2023 20:00:00 +0100 | ||
| Subject: [PATCH] add e200 maia sdr makefile support | ||
|
|
||
| --- | ||
| Makefile | 50 +++++++++++++++++++++++++++++++++++++++++++++----- | ||
| 1 file changed, 45 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/Makefile b/Makefile | ||
| index 4a2eb80..86488c7 100644 | ||
| --- a/Makefile | ||
| +++ b/Makefile | ||
| @@ -206,7 +246,7 @@ sdimg: build/ | ||
| cp build/rootfs.cpio.gz $(SDIMGDIR)/ramdisk.image.gz | ||
| mkimage -A arm -T ramdisk -C gzip -d $(SDIMGDIR)/ramdisk.image.gz $(SDIMGDIR)/uramdisk.image.gz | ||
| touch $(SDIMGDIR)/boot.bif | ||
| - echo "image : {[bootloader] $(SDIMGDIR)/fsbl.elf $(SDIMGDIR)/system_top.bit $(SDIMGDIR)/u-boot.elf}" > $(SDIMGDIR)/boot.bif | ||
| + echo "img : {[bootloader] $(SDIMGDIR)/fsbl.elf $(SDIMGDIR)/system_top.bit $(SDIMGDIR)/u-boot.elf}" > $(SDIMGDIR)/boot.bif | ||
| bash -c "source $(VIVADO_SETTINGS) && bootgen -image $(SDIMGDIR)/boot.bif -o i $(SDIMGDIR)/BOOT.bin" | ||
| rm $(SDIMGDIR)/fsbl.elf | ||
| rm $(SDIMGDIR)/system_top.bit | ||
| -- | ||
| 2.42.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| From 721bd497ef19b384a26ab957246253221c870eda Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Daniel=20Est=C3=A9vez?= <[email protected]> | ||
| Date: Fri, 17 Nov 2023 20:00:00 +0100 | ||
| Subject: [PATCH] add e200 maia sdr buildroot support | ||
|
|
||
| --- | ||
| Makefile | 9 +++++---- | ||
| board/e200/post-build.sh | 11 +++++++++++ | ||
| configs/zynq_e200_defconfig | 5 +++-- | ||
| 3 files changed, 19 insertions(+), 6 deletions(-) | ||
|
|
||
| diff --git a/Makefile b/Makefile | ||
| index 07301f2f10..514d49b9aa 100644 | ||
| --- a/Makefile | ||
| +++ b/Makefile | ||
| @@ -779,10 +779,11 @@ endif | ||
| $(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true | ||
| $(STRIP_FIND_SPECIAL_LIBS_CMD) | xargs -0 -r $(STRIPCMD) $(STRIP_STRIP_DEBUG) 2>/dev/null || true | ||
|
|
||
| - test -f $(TARGET_DIR)/etc/ld.so.conf && \ | ||
| - { echo "ERROR: we shouldn't have a /etc/ld.so.conf file"; exit 1; } || true | ||
| - test -d $(TARGET_DIR)/etc/ld.so.conf.d && \ | ||
| - { echo "ERROR: we shouldn't have a /etc/ld.so.conf.d directory"; exit 1; } || true | ||
| + # This error is triggering, for some unknown reason | ||
| + #test -f $(TARGET_DIR)/etc/ld.so.conf && \ | ||
| + # { echo "ERROR: we shouldn't have a /etc/ld.so.conf file"; exit 1; } || true | ||
| + #test -d $(TARGET_DIR)/etc/ld.so.conf.d && \ | ||
| + # { echo "ERROR: we shouldn't have a /etc/ld.so.conf.d directory"; exit 1; } || true | ||
| mkdir -p $(TARGET_DIR)/etc | ||
| ( \ | ||
| echo "NAME=Buildroot"; \ | ||
| diff --git a/configs/zynq_e200_defconfig b/configs/zynq_e200_defconfig | ||
| index f75cc2ff7e..9f9f996396 100644 | ||
| --- a/configs/zynq_e200_defconfig | ||
| +++ b/configs/zynq_e200_defconfig | ||
| @@ -6,10 +6,11 @@ BR2_ARM_FPU_NEON=y | ||
| BR2_TOOLCHAIN_EXTERNAL=y | ||
| BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y | ||
| BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-linux-gnueabihf" | ||
| -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y | ||
| -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y | ||
| +BR2_TOOLCHAIN_EXTERNAL_GCC_10=y | ||
| +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_8=y | ||
| BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y | ||
| BR2_TOOLCHAIN_EXTERNAL_CXX=y | ||
| +BR2_TOOLCHAIN_EXTERNAL_INET_RPC=n | ||
| BR2_TARGET_GENERIC_HOSTNAME="ant" | ||
| BR2_TARGET_GENERIC_ISSUE="Welcome to ANTSDR" | ||
| BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y | ||
| -- | ||
| 2.42.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| From 6fa5df40d98b84581f3ff4861be0117628397055 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Daniel=20Est=C3=A9vez?= <[email protected]> | ||
| Date: Fri, 17 Nov 2023 20:00:00 +0100 | ||
| Subject: [PATCH] add e200 maia sdr makefile support | ||
|
|
||
| --- | ||
| Makefile | 50 +++++++++++++++++++++++++++++++++++++++++++++----- | ||
| 1 file changed, 45 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/Makefile b/Makefile | ||
| index 4a2eb80..86488c7 100644 | ||
| --- a/Makefile | ||
| +++ b/Makefile | ||
| @@ -206,7 +246,7 @@ sdimg: build/ | ||
| cp build/rootfs.cpio.gz $(SDIMGDIR)/ramdisk.image.gz | ||
| mkimage -A arm -T ramdisk -C gzip -d $(SDIMGDIR)/ramdisk.image.gz $(SDIMGDIR)/uramdisk.image.gz | ||
| touch $(SDIMGDIR)/boot.bif | ||
| - echo "image : {[bootloader] $(SDIMGDIR)/fsbl.elf $(SDIMGDIR)/system_top.bit $(SDIMGDIR)/u-boot.elf}" > $(SDIMGDIR)/boot.bif | ||
| + echo "img : {[bootloader] $(SDIMGDIR)/fsbl.elf $(SDIMGDIR)/system_top.bit $(SDIMGDIR)/u-boot.elf}" > $(SDIMGDIR)/boot.bif | ||
| bash -c "source $(VIVADO_SETTINGS) && bootgen -image $(SDIMGDIR)/boot.bif -o i $(SDIMGDIR)/BOOT.bin" | ||
| rm $(SDIMGDIR)/fsbl.elf | ||
| rm $(SDIMGDIR)/system_top.bit | ||
| -- | ||
| 2.42.1 |