diff --git a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml index 3e93461f..955ae7ff 100644 --- a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml +++ b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml @@ -46,12 +46,12 @@ default: =: kernel-3.2-lts-arm-iproc-all.bin.gz <<: *arm-iproc-kernel-package - arm-iproc-4-14-kernel-package: &arm-iproc-4-14-kernel-package - package: onl-kernel-4.14-lts-arm-iproc-all:armel + armel-iproc-4-14-kernel-package: &armel-iproc-4-14-kernel-package + package: onl-kernel-4.14-lts-armel-iproc-all:armel - arm-iproc-4-14-kernel: &arm-iproc-4-14-kernel - =: kernel-4.14-lts-arm-iproc-all.bin.gz - <<: *arm-iproc-4-14-kernel-package + armel-iproc-4-14-kernel: &armel-iproc-4-14-kernel + =: kernel-4.14-lts-armel-iproc-all.bin.gz + <<: *armel-iproc-4-14-kernel-package arm64-kernel-package: &arm64-kernel-package package: onl-kernel-4.9-lts-arm64-all:arm64 diff --git a/packages/base/any/kernels/4.14-lts/configs/arm-iproc-all/.gitignore b/packages/base/any/kernels/4.14-lts/configs/arm-iproc-all/.gitignore deleted file mode 100644 index 3898a1cf..00000000 --- a/packages/base/any/kernels/4.14-lts/configs/arm-iproc-all/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -linux-3.2* -kernel-3.2* diff --git a/packages/base/any/kernels/4.14-lts/configs/armel-iproc-all/.gitignore b/packages/base/any/kernels/4.14-lts/configs/armel-iproc-all/.gitignore new file mode 100644 index 00000000..285a565e --- /dev/null +++ b/packages/base/any/kernels/4.14-lts/configs/armel-iproc-all/.gitignore @@ -0,0 +1,2 @@ +linux-4.14* +kernel-4.14* diff --git a/packages/base/any/kernels/4.14-lts/configs/arm-iproc-all/Makefile b/packages/base/any/kernels/4.14-lts/configs/armel-iproc-all/Makefile similarity index 87% rename from packages/base/any/kernels/4.14-lts/configs/arm-iproc-all/Makefile rename to packages/base/any/kernels/4.14-lts/configs/armel-iproc-all/Makefile index 26b39526..7c708593 100644 --- a/packages/base/any/kernels/4.14-lts/configs/arm-iproc-all/Makefile +++ b/packages/base/any/kernels/4.14-lts/configs/armel-iproc-all/Makefile @@ -1,4 +1,4 @@ -############################################################ +########################################################### # # # Copyright 2015 Big Switch Networks, Inc. @@ -29,12 +29,12 @@ endif K_PATCH_DIR := $(THIS_DIR)/patches include ../../kconfig.mk -K_CONFIG := arm-iproc-all.config +K_CONFIG := armel-iproc-all.config K_BUILD_TARGET := Image K_COPY_SRC := arch/arm/boot/Image K_COPY_GZIP := 1 ifndef K_COPY_DST -K_COPY_DST := kernel-4.14-lts-arm-iproc-all.bin.gz +K_COPY_DST := kernel-4.14-lts-armel-iproc-all.bin.gz endif export ARCH=arm diff --git a/packages/base/any/kernels/4.14-lts/configs/arm-iproc-all/arm-iproc-all.config b/packages/base/any/kernels/4.14-lts/configs/armel-iproc-all/armel-iproc-all.config similarity index 100% rename from packages/base/any/kernels/4.14-lts/configs/arm-iproc-all/arm-iproc-all.config rename to packages/base/any/kernels/4.14-lts/configs/armel-iproc-all/armel-iproc-all.config diff --git a/packages/base/armel/kernels/kernel-4.14-lts-arm-iproc-all/Makefile b/packages/base/armel/kernels/kernel-4.14-lts-armel-iproc-all/Makefile similarity index 100% rename from packages/base/armel/kernels/kernel-4.14-lts-arm-iproc-all/Makefile rename to packages/base/armel/kernels/kernel-4.14-lts-armel-iproc-all/Makefile diff --git a/packages/base/armel/kernels/kernel-4.14-lts-arm-iproc-all/PKG.yml b/packages/base/armel/kernels/kernel-4.14-lts-armel-iproc-all/PKG.yml similarity index 64% rename from packages/base/armel/kernels/kernel-4.14-lts-arm-iproc-all/PKG.yml rename to packages/base/armel/kernels/kernel-4.14-lts-armel-iproc-all/PKG.yml index 544b2445..4ff5b41f 100644 --- a/packages/base/armel/kernels/kernel-4.14-lts-arm-iproc-all/PKG.yml +++ b/packages/base/armel/kernels/kernel-4.14-lts-armel-iproc-all/PKG.yml @@ -1 +1 @@ -!include $ONL/packages/base/any/kernels/lts/APKG.yml VERSION=4.14 ARCH=armel CONFIG=arm-iproc-all +!include $ONL/packages/base/any/kernels/lts/APKG.yml VERSION=4.14 ARCH=armel CONFIG=armel-iproc-all diff --git a/packages/base/armel/kernels/kernel-4.14-lts-arm-iproc-all/builds/.gitignore b/packages/base/armel/kernels/kernel-4.14-lts-armel-iproc-all/builds/.gitignore similarity index 100% rename from packages/base/armel/kernels/kernel-4.14-lts-arm-iproc-all/builds/.gitignore rename to packages/base/armel/kernels/kernel-4.14-lts-armel-iproc-all/builds/.gitignore diff --git a/packages/base/armel/kernels/kernel-4.14-lts-arm-iproc-all/builds/Makefile b/packages/base/armel/kernels/kernel-4.14-lts-armel-iproc-all/builds/Makefile similarity index 76% rename from packages/base/armel/kernels/kernel-4.14-lts-arm-iproc-all/builds/Makefile rename to packages/base/armel/kernels/kernel-4.14-lts-armel-iproc-all/builds/Makefile index 1199c91f..023ecdb6 100644 --- a/packages/base/armel/kernels/kernel-4.14-lts-arm-iproc-all/builds/Makefile +++ b/packages/base/armel/kernels/kernel-4.14-lts-armel-iproc-all/builds/Makefile @@ -1,6 +1,5 @@ KERNEL_BUILD_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) KERNEL_ARCH := arm KERNEL_LTS_VERSION := 4.14 -KERNEL_CONFIG := arm-iproc-all -#NO_MODULE_BUILDS := 1 +KERNEL_CONFIG := armel-iproc-all include $(ONL)/packages/base/any/kernels/lts/builds/Makefile diff --git a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/modules/PKG.yml b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/modules/PKG.yml index 3075003c..44a0e946 100644 --- a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/modules/PKG.yml +++ b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/modules/PKG.yml @@ -1 +1 @@ -!include $ONL_TEMPLATES/platform-modules.yml ARCH=armel VENDOR=accton BASENAME=arm-accton-as4610-30 KERNELS="onl-kernel-4.14-lts-arm-iproc-all:armel" +!include $ONL_TEMPLATES/platform-modules.yml ARCH=armel VENDOR=accton BASENAME=arm-accton-as4610-30 KERNELS="onl-kernel-4.14-lts-armel-iproc-all:armel" diff --git a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/modules/builds/Makefile b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/modules/builds/Makefile index 31f7b1c4..440a0ff3 100644 --- a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/modules/builds/Makefile +++ b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/modules/builds/Makefile @@ -1,4 +1,4 @@ -KERNELS := onl-kernel-4.14-lts-arm-iproc-all:armel +KERNELS := onl-kernel-4.14-lts-armel-iproc-all:armel KMODULES := $(wildcard $(ONL)/packages/platforms/accton/armel/arm-accton-as4610/src/modules/*.c) KINCLUDES := $(wildcard $(ONL)/packages/platforms/accton/armel/arm-accton-as4610/src/modules/*.h) VENDOR := accton diff --git a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/platform-config/r0/builds/dtb/Makefile b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/platform-config/r0/builds/dtb/Makefile index 774287a7..d3118ad6 100644 --- a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/platform-config/r0/builds/dtb/Makefile +++ b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/platform-config/r0/builds/dtb/Makefile @@ -1,5 +1,5 @@ INCLUDES=include . -KERNEL := onl-kernel-4.14-lts-arm-iproc-all:armel +KERNEL := onl-kernel-4.14-lts-armel-iproc-all:armel DTS_LIST := arm-accton-as4610.dts VPATH := ../../../../../src include $(ONL)/make/dtbs.mk @@ -8,8 +8,8 @@ include $(ONL)/make/dtbs.mk # The 4610 DTS relies on the common arm devices tree includes. These are linked here from the kernel package. # setup:: - onlpm --link-dir onl-kernel-4.14-lts-arm-iproc-all:armel /usr/share/onl/packages/armel/onl-kernel-4.14-lts-arm-iproc-all/mbuilds/arch/arm/boot/dts dts - onlpm --link-dir onl-kernel-4.14-lts-arm-iproc-all:armel /usr/share/onl/packages/armel/onl-kernel-4.14-lts-arm-iproc-all/mbuilds/include include + onlpm --link-dir onl-kernel-4.14-lts-armel-iproc-all:armel /usr/share/onl/packages/armel/onl-kernel-4.14-lts-armel-iproc-all/mbuilds/arch/arm/boot/dts dts + onlpm --link-dir onl-kernel-4.14-lts-armel-iproc-all:armel /usr/share/onl/packages/armel/onl-kernel-4.14-lts-armel-iproc-all/mbuilds/include include setup-clean:: rm -f dts include diff --git a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/platform-config/r0/src/lib/arm-accton-as4610-30-r0.yml b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/platform-config/r0/src/lib/arm-accton-as4610-30-r0.yml index aa211301..013f2867 100644 --- a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/platform-config/r0/src/lib/arm-accton-as4610-30-r0.yml +++ b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/platform-config/r0/src/lib/arm-accton-as4610-30-r0.yml @@ -9,7 +9,7 @@ arm-accton-as4610-30-r0: flat_image_tree: kernel: - <<: *arm-iproc-4-14-kernel + <<: *armel-iproc-4-14-kernel dtb: =: arm-accton-as4610.dtb package: onl-platform-build-arm-accton-as4610-30-r0:armel diff --git a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/modules/PKG.yml b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/modules/PKG.yml index 45fc38d0..edaa8ee6 100644 --- a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/modules/PKG.yml +++ b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/modules/PKG.yml @@ -1 +1 @@ -!include $ONL_TEMPLATES/platform-modules.yml ARCH=armel VENDOR=accton BASENAME=arm-accton-as4610-54 KERNELS="onl-kernel-4.14-lts-arm-iproc-all:armel" +!include $ONL_TEMPLATES/platform-modules.yml ARCH=armel VENDOR=accton BASENAME=arm-accton-as4610-54 KERNELS="onl-kernel-4.14-lts-armel-iproc-all:armel" diff --git a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/modules/builds/Makefile b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/modules/builds/Makefile index 0d369815..9acef27d 100644 --- a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/modules/builds/Makefile +++ b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/modules/builds/Makefile @@ -1,4 +1,4 @@ -KERNELS := onl-kernel-4.14-lts-arm-iproc-all:armel +KERNELS := onl-kernel-4.14-lts-armel-iproc-all:armel KMODULES := $(wildcard $(ONL)/packages/platforms/accton/armel/arm-accton-as4610/src/modules/*.c) KINCLUDES := $(wildcard $(ONL)/packages/platforms/accton/armel/arm-accton-as4610/src/modules/*.h) VENDOR := accton diff --git a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/platform-config/r0/builds/dtb/Makefile b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/platform-config/r0/builds/dtb/Makefile index 774287a7..d3118ad6 100644 --- a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/platform-config/r0/builds/dtb/Makefile +++ b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/platform-config/r0/builds/dtb/Makefile @@ -1,5 +1,5 @@ INCLUDES=include . -KERNEL := onl-kernel-4.14-lts-arm-iproc-all:armel +KERNEL := onl-kernel-4.14-lts-armel-iproc-all:armel DTS_LIST := arm-accton-as4610.dts VPATH := ../../../../../src include $(ONL)/make/dtbs.mk @@ -8,8 +8,8 @@ include $(ONL)/make/dtbs.mk # The 4610 DTS relies on the common arm devices tree includes. These are linked here from the kernel package. # setup:: - onlpm --link-dir onl-kernel-4.14-lts-arm-iproc-all:armel /usr/share/onl/packages/armel/onl-kernel-4.14-lts-arm-iproc-all/mbuilds/arch/arm/boot/dts dts - onlpm --link-dir onl-kernel-4.14-lts-arm-iproc-all:armel /usr/share/onl/packages/armel/onl-kernel-4.14-lts-arm-iproc-all/mbuilds/include include + onlpm --link-dir onl-kernel-4.14-lts-armel-iproc-all:armel /usr/share/onl/packages/armel/onl-kernel-4.14-lts-armel-iproc-all/mbuilds/arch/arm/boot/dts dts + onlpm --link-dir onl-kernel-4.14-lts-armel-iproc-all:armel /usr/share/onl/packages/armel/onl-kernel-4.14-lts-armel-iproc-all/mbuilds/include include setup-clean:: rm -f dts include diff --git a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/platform-config/r0/src/lib/arm-accton-as4610-54-r0.yml b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/platform-config/r0/src/lib/arm-accton-as4610-54-r0.yml index b7c8d4ba..077a149a 100644 --- a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/platform-config/r0/src/lib/arm-accton-as4610-54-r0.yml +++ b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/platform-config/r0/src/lib/arm-accton-as4610-54-r0.yml @@ -9,7 +9,7 @@ arm-accton-as4610-54-r0: flat_image_tree: kernel: - <<: *arm-iproc-4-14-kernel + <<: *armel-iproc-4-14-kernel dtb: =: arm-accton-as4610.dtb package: onl-platform-build-arm-accton-as4610-54-r0:armel