Skip to content

Commit

Permalink
Merge pull request sonic-net#176 from antony-rheneus/armhf-master-review
Browse files Browse the repository at this point in the history
[marvell-armhf] Armada A385 soc support
  • Loading branch information
lguohan authored Dec 17, 2020
2 parents 7d6a571 + 782ce13 commit 6f53047
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 322 deletions.
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ CONFIGURED_ARCH ?= amd64

LINUX_HEADER_COMMON = linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_all.deb
LINUX_HEADER_AMD64 = linux-headers-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb
LINUX_IMAGE = linux-image-$(KVERSION)-unsigned_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb
ifeq ($(CONFIGURED_ARCH), armhf)
LINUX_IMAGE = linux-image-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb
else
LINUX_IMAGE = linux-image-$(KVERSION)-unsigned_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb
endif

MAIN_TARGET = $(LINUX_HEADER_COMMON)
DERIVED_TARGETS = $(LINUX_HEADER_AMD64) $(LINUX_IMAGE)
Expand Down Expand Up @@ -95,7 +99,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :

# Optionally add/remove kernel options
if [ -f ../manage-config ]; then
../manage-config $(CONFIGURED_ARCH)
../manage-config $(CONFIGURED_ARCH) $(CONFIGURED_PLATFORM)
fi

# Building a custom kernel from Debian kernel source
Expand Down
10 changes: 7 additions & 3 deletions manage-config
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@

# Configuration file to change
ARCH=amd64
if [ $# = 1 ]; then
PLATFORM=
if [ $# -ge 1 ]; then
ARCH=$1
fi
if [ $# -ge 2 ]; then
PLATFORM=$2
fi
case "$ARCH" in
amd64)
CONFIG_FILE_LOC=debian/build/build_amd64_none_amd64
Expand Down Expand Up @@ -61,7 +65,7 @@ if [ -e ${exclusion_file} -o -e ${inclusion_file} ]; then

# Process any exclusions in the kernel
if [ -f ${exclusion_file} ]; then
exclusion_opts=$(get_section_opts ${exclusion_file} "common" ${ARCH})
exclusion_opts=$(get_section_opts ${exclusion_file} "common" ${ARCH} ${PLATFORM})
while read -r opt; do
if [ ! -z "$opt" ] && [[ ! "$opt" =~ ^#.* ]]; then
scripts/config --file ${CONFIG_FILE} -d $opt
Expand All @@ -71,7 +75,7 @@ if [ -e ${exclusion_file} -o -e ${inclusion_file} ]; then

# Process any inclusions in the kernel
if [ -f ${inclusion_file} ]; then
inclusion_opts=$(get_section_opts ${inclusion_file} "common" ${ARCH})
inclusion_opts=$(get_section_opts ${inclusion_file} "common" ${ARCH} ${PLATFORM})
while read -r opt; do
if [ ! -z "$opt" ] && [[ ! "$opt" =~ ^#.* ]]; then
echo $opt >> ${CONFIG_FILE}
Expand Down
74 changes: 0 additions & 74 deletions patch/0001-arm64-default-config-for-sonic-patches.patch

This file was deleted.

82 changes: 0 additions & 82 deletions patch/0001-armhf-default-config-for-the-sonic-patches.patch

This file was deleted.

41 changes: 0 additions & 41 deletions patch/0042-Marvell-a385-Micron-4G-flash-support.patch

This file was deleted.

89 changes: 0 additions & 89 deletions patch/0042-armhf-additional-configs.patch

This file was deleted.

22 changes: 0 additions & 22 deletions patch/0042-armhf-proc-dma-kconfig.patch

This file was deleted.

28 changes: 28 additions & 0 deletions patch/kconfig-exclusions
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,31 @@ CONFIG_MLXSW_PCI
[arm64]

[armhf]

[marvell-armhf]
CONFIG_ARCH_VIRT
CONFIG_ARCH_BCM
CONFIG_ARCH_EXYNOS
CONFIG_ARCH_HIGHBANK
CONFIG_ARCH_MXC
CONFIG_ARCH_MESON
CONFIG_ARCH_OMAP3
CONFIG_ARCH_OMAP4
CONFIG_SOC_OMAP5
CONFIG_SOC_AM33XX
CONFIG_SOC_DRA7XX
CONFIG_ARCH_ROCKCHIP
CONFIG_ARCH_SOCFPGA
CONFIG_ARCH_SUNXI
CONFIG_ARCH_TEGRA
CONFIG_ARCH_VEXPRESS
CONFIG_ARCH_WM8850
CONFIG_FW_CFG_SYSFS
CONFIG_VORTEX
CONFIG_NTP_PPS
CONFIG_SENSORS_MAX6620
CONFIG_SND_LX6464ES
CONFIG_EFI
CONFIG_LOCK_DOWN_KERNEL
CONFIG_SECONDARY_TRUSTED_KEYRING
CONFIG_SYSTEM_BLACKLIST_KEYRING
Loading

0 comments on commit 6f53047

Please sign in to comment.