Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[marvell-armhf] Armada A385 soc support #176

Merged
merged 7 commits into from
Dec 17, 2020
+48 −322
Merged

[marvell-armhf] Armada A385 soc support #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f6c2bb
Marvell-armhf: Remove obsolete patches applied for marvell arm
antony-rheneus Dec 1, 2020
70b47bc
Marvell-armhf: Enable platform specific kconfig
antony-rheneus Dec 1, 2020
57bc6d7
Marvell-armhf: armada: Set gpio and mtd platform specific configuration
antony-rheneus Dec 1, 2020
3ef6c65
Marvell-armhf: Enable optoe and i2c mux
antony-rheneus Dec 1, 2020
b4414f2
Marvell-armhf: Reduce kernel image size for u-boot
antony-rheneus Dec 1, 2020
db676d5
Marvell-armhf: Disable uefi firmware for marvell
antony-rheneus Dec 1, 2020
782ce13
armhf: Update linux debian image file name
antony-rheneus Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions patch/0001-armhf-default-config-for-the-sonic-patches.patch
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions patch/0042-Marvell-a385-Micron-4G-flash-support.patch
View file
Open in desktop

This file was deleted.

89 changes: 0 additions & 89 deletions patch/0042-armhf-additional-configs.patch
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions patch/0042-armhf-proc-dma-kconfig.patch
View file
Open in desktop

This file was deleted.

28 changes: 28 additions & 0 deletions patch/kconfig-exclusions
View file
Open in desktop
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