Skip to content

Commit 53ac49b

Browse files
synopsys-arcoss-autosynopsys-arcoss-auto
committed
Merge branch 'arc-dev' into arc-staging
2 parents de924d0 + 13eaf34 commit 53ac49b

File tree

3 files changed

+30
-29
lines changed

3 files changed

+30
-29
lines changed

‎doc/linux/kernel-build.rst‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,15 @@ Contents of this file should be following::
7878
BR2_TOOLCHAIN_EXTERNAL=y
7979
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
8080
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
81-
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-rc1/arc_gnu_2021.03-rc1_prebuilt_uclibc_le_archs_linux_install.tar.gz"
82-
BR2_TOOLCHAIN_EXTERNAL_GCC_10=y
83-
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
81+
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-rc2/arc_gnu_2021.03-rc2_prebuilt_uclibc_le_archs_linux_install.tar.gz"
82+
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_1=y
8483
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
8584
BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
8685
BR2_TOOLCHAIN_EXTERNAL_CXX=y
8786
BR2_LINUX_KERNEL=y
8887
BR2_LINUX_KERNEL_DEFCONFIG="haps_hs"
8988
BR2_LINUX_KERNEL_VMLINUX=y
90-
BR2_PACKAGE_GDB=y
91-
BR2_PACKAGE_GDB_DEBUGGER=y
9289
BR2_TARGET_ROOTFS_INITRAMFS=y
93-
# BR2_TARGET_ROOTFS_TAR is not set
9490

9591
Important notes about modifying Buildroot defconfig:
9692

@@ -102,7 +98,7 @@ Important notes about modifying Buildroot defconfig:
10298
=================== =======================
10399
Toolchain version Linux headers version
104100
=================== =======================
105-
2021.03 5.4
101+
2021.03 5.1
106102
2020.09 5.7
107103
2020.03 4.15
108104
2019.09 4.15
@@ -191,19 +187,30 @@ differences::
191187
BR2_TOOLCHAIN_EXTERNAL=y
192188
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
193189
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
194-
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-rc1/arc_gnu_2021.03-rc1_prebuilt_glibc_le_archs_linux_install.tar.gz"
195-
BR2_TOOLCHAIN_EXTERNAL_GCC_10=y
196-
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
190+
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-rc2/arc_gnu_2021.03-rc2_prebuilt_glibc_le_archs_linux_install.tar.gz"
191+
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_1=y
197192
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
198193
BR2_TOOLCHAIN_EXTERNAL_CXX=y
199194
BR2_LINUX_KERNEL=y
200195
BR2_LINUX_KERNEL_DEFCONFIG="haps_hs"
201196
BR2_LINUX_KERNEL_VMLINUX=y
202-
BR2_PACKAGE_GDB=y
203-
BR2_PACKAGE_GDB_DEBUGGER=y
204197
BR2_TARGET_ROOTFS_INITRAMFS=y
205-
# BR2_TARGET_ROOTFS_TAR is not set
206198

199+
But please note due to use of glibc 2.33 it's required to disable use of built-in Sun RPC, which as of today is force-enabled for external glibc-based toolchains.
200+
This has to be done with removal of 1 line in Buildroot sources, see diff of the change below::
201+
202+
diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
203+
index 992fd2c150..45dfacaff1 100644
204+
--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
205+
+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
206+
@@ -452,7 +452,6 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP_STRONG
207+
208+
config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
209+
bool "Toolchain has RPC support?"
210+
- default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC
211+
depends on !BR2_TOOLCHAIN_EXTERNAL_MUSL
212+
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
213+
help
207214

208215
Linux for ARC 770 processors
209216
----------------------------
@@ -212,9 +219,9 @@ Process of building kernel for ARC 770 is similar to what is for ARC HS. It is
212219
required only to change several option in Buildroot defconfig:
213220

214221
* ``BR2_archs38=y`` with ``BR2_arc770d=y``
215-
* ``BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-rc1/arc_gnu_2021.03-rc1_prebuilt_uclibc_le_archs_linux_install.tar.gz"``
222+
* ``BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-rc2/arc_gnu_2021.03-rc2_prebuilt_uclibc_le_archs_linux_install.tar.gz"``
216223
with
217-
``BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-rc1/arc_gnu_2021.03-rc1_prebuilt_uclibc_le_arc700_linux_install.tar.gz"``
224+
``BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-rc2/arc_gnu_2021.03-rc2_prebuilt_uclibc_le_arc700_linux_install.tar.gz"``
218225
* ``BR2_LINUX_KERNEL_DEFCONFIG="haps_hs"`` with
219226
``BR2_LINUX_KERNEL_DEFCONFIG="nsim_700"``
220227

@@ -243,19 +250,15 @@ With those changes Buildroot defconfig for ARC HS VDK is::
243250
BR2_TOOLCHAIN_EXTERNAL=y
244251
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
245252
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
246-
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-rc1/arc_gnu_2021.03-rc1_prebuilt_uclibc_le_archs_linux_install.tar.gz"
247-
BR2_TOOLCHAIN_EXTERNAL_GCC_10=y
248-
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
253+
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-rc2/arc_gnu_2021.03-rc2_prebuilt_uclibc_le_archs_linux_install.tar.gz"
254+
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_1=y
249255
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
250256
BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
251257
BR2_TOOLCHAIN_EXTERNAL_CXX=y
252258
BR2_LINUX_KERNEL=y
253259
BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp"
254260
BR2_LINUX_KERNEL_VMLINUX=y
255-
BR2_PACKAGE_GDB=y
256-
BR2_PACKAGE_GDB_DEBUGGER=y
257261
BR2_TARGET_ROOTFS_EXT2=y
258-
# BR2_TARGET_ROOTFS_TAR is not set
259262

260263
Save this defconfig to some file (for example ``vdk_defconfig``). Then use same
261264
process as in :ref:`linux-building-label` section.::
@@ -332,18 +335,14 @@ defconfig is::
332335
BR2_TOOLCHAIN_EXTERNAL=y
333336
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
334337
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
335-
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-rc1/arc_gnu_2021.03-rc1_prebuilt_uclibc_le_archs_linux_install.tar.gz"
336-
BR2_TOOLCHAIN_EXTERNAL_GCC_10=y
337-
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
338+
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-rc2/arc_gnu_2021.03-rc2_prebuilt_uclibc_le_archs_linux_install.tar.gz"
339+
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_1=y
338340
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
339341
BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
340342
BR2_TOOLCHAIN_EXTERNAL_CXX=y
341343
BR2_LINUX_KERNEL=y
342344
BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp"
343-
BR2_PACKAGE_GDB=y
344-
BR2_PACKAGE_GDB_DEBUGGER=y
345345
BR2_TARGET_ROOTFS_INITRAMFS=y
346-
# BR2_TARGET_ROOTFS_TAR is not set
347346

348347
This defconfig will create a uImage file instead of vmlinux. Please refer to
349348
`ARC Linux wiki

‎github/create-release.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
| ------------------- | ------------ | -------------- | ------------ | ------------ |
5252
| Baremetal | {0} \ {1} | | | {2} \ {3} |
5353
| Linux/uClibc ARC700 | {4} \ {5} | | | |
54-
| Linux/uClibc ARC HS | {6} \ {7} | | {10} | |
55-
| Linux/glibc ARC HS | {13} \ {14} | | | |
54+
| Linux/uClibc ARC HS | {6} \ {7} | | | |
55+
| Linux/glibc ARC HS | {13} \ {14} | | {10} | |
5656
| IDE | {11} | {12} | | {15} |
5757
""".format(
5858
fformat.format(t=le, release=args.release_id, type="elf32", cpu="le", host="linux"),

‎release.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,8 @@ BUILD_DEPS-$(ENABLE_DOCS_PACKAGE) += $O/$(DOCS_DIR)$(TAR_EXT)
424424

425425
BUILD_DEPS-$(ENABLE_IDE) += $O/.stamp_ide_linux_tar
426426
BUILD_DEPS-$(ENABLE_IDE_MACOS) += $O/.stamp_ide_macos_tar
427+
BUILD_DEPS-$(ENABLE_IDE_MACOS) += $O/.stamp_elf_le_mac_tarball
428+
BUILD_DEPS-$(ENABLE_IDE_MACOS) += $O/.stamp_elf_be_mac_tarball
427429
BUILD_DEPS-$(ENABLE_IDE_PLUGINS_BUILD) += $O/$(IDE_PLUGINS_ZIP)
428430
BUILD_DEPS-$(ENABLE_NATIVE_TOOLS) += $O/.stamp_glibc_le_hs_native_tarball
429431
BUILD_DEPS-$(ENABLE_OPENOCD) += $O/$(OOCD_HOST_DIR)$(TAR_EXT)

0 commit comments

Comments
 (0)