Skip to content

Commit 376978c

Browse files
antony-rheneustaocy
authored andcommitted
1. Back ported commit from master
Adding support to compile ARM architecture (sonic-net#102) 2. Added support for marvell Armada A7020 Arm64 Signed-off-by: Antony Rheneus <arheneus@marvell.com>
1 parent 9d62fa0 commit 376978c

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

Makefile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ KVERSION ?= $(KVERSION_SHORT)-amd64
88
KERNEL_VERSION ?= 4.9.189
99
KERNEL_SUBVERSION ?= 3+deb9u2
1010
kernel_procure_method ?= build
11+
CONFIGURED_ARCH ?= amd64
1112

1213
LINUX_HEADER_COMMON = linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_all.deb
13-
LINUX_HEADER_AMD64 = linux-headers-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb
14-
LINUX_IMAGE = linux-image-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb
14+
LINUX_HEADER_AMD64 = linux-headers-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb
15+
LINUX_IMAGE = linux-image-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb
1516

1617
MAIN_TARGET = $(LINUX_HEADER_COMMON)
1718
DERIVED_TARGETS = $(LINUX_HEADER_AMD64) $(LINUX_IMAGE)
@@ -73,9 +74,13 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
7374
debian/bin/gencontrol.py
7475

7576
# generate linux build file for amd64_none_amd64
77+
fakeroot make -f debian/rules.gen setup_armhf_none_armmp
78+
fakeroot make -f debian/rules.gen setup_arm64_none
7679
fakeroot make -f debian/rules.gen setup_amd64_none_amd64
7780

7881
# Applying patches and configuration changes
82+
git add debian/build/build_armhf_none_armmp/.config -f
83+
git add debian/build/build_arm64_none_arm64/.config -f
7984
git add debian/build/build_amd64_none_amd64/.config -f
8085
git add debian/config.defines.dump -f
8186
git add debian/control -f
@@ -89,7 +94,11 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
8994

9095
# Building a custom kernel from Debian kernel source
9196
DO_DOCS=False fakeroot make -f debian/rules -j $(shell nproc) binary-indep
92-
fakeroot make -f debian/rules.gen -j $(shell nproc) binary-arch_amd64_none
97+
ifeq ($(CONFIGURED_ARCH), armhf)
98+
fakeroot make -f debian/rules.gen -j $(shell nproc) binary-arch_$(CONFIGURED_ARCH)_none_armmp
99+
else
100+
fakeroot make -f debian/rules.gen -j $(shell nproc) binary-arch_$(CONFIGURED_ARCH)_none
101+
endif
93102
popd
94103

95104
ifneq ($(DEST),)

patch/0001-Marvell-support-for-armada7020-on-LK4.9.168.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10260,7 +10260,7 @@ index 00000000..4e09824
1026010260
+obj-$(CONFIG_MTD_NAND_BCH) += nand_bch.o
1026110261
+obj-$(CONFIG_MTD_SM_COMMON) += sm_common.o
1026210262
+
10263-
+obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o
10263+
+#obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o
1026410264
+obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o
1026510265
+obj-$(CONFIG_MTD_NAND_DENALI) += denali.o
1026610266
+obj-$(CONFIG_MTD_NAND_DENALI_PCI) += denali_pci.o
@@ -10274,7 +10274,7 @@ index 00000000..4e09824
1027410274
+obj-$(CONFIG_MTD_NAND_DOCG4) += docg4.o
1027510275
+obj-$(CONFIG_MTD_NAND_FSMC) += fsmc_nand.o
1027610276
+obj-$(CONFIG_MTD_NAND_SHARPSL) += sharpsl.o
10277-
+obj-$(CONFIG_MTD_NAND_NANDSIM) += nandsim.o
10277+
+#obj-$(CONFIG_MTD_NAND_NANDSIM) += nandsim.o
1027810278
+obj-$(CONFIG_MTD_NAND_CS553X) += cs553x_nand.o
1027910279
+obj-$(CONFIG_MTD_NAND_NDFC) += ndfc.o
1028010280
+obj-$(CONFIG_MTD_NAND_ATMEL) += atmel/

0 commit comments

Comments
 (0)