Skip to content

Commit d3bf119

Browse files
committed
mark-one: remove mxc-scc2 module for
mxc-scc2 module is not maintained anymore.
1 parent 81bc64b commit d3bf119

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

Makefile

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ CAAM_KEYBLOB_BRANCH=longterm-6.12
2020
USBARMORY_REPO=https://raw.githubusercontent.com/usbarmory/usbarmory/master
2121
ARMORYCTL_REPO=https://github.com/usbarmory/armoryctl
2222
CRUCIBLE_REPO=https://github.com/usbarmory/crucible
23-
MXC_SCC2_REPO=https://github.com/usbarmory/mxc-scc2
2423
MXS_DCP_REPO=https://github.com/usbarmory/mxs-dcp
2524
CAAM_KEYBLOB_REPO=https://github.com/usbarmory/caam-keyblob
2625
IMG_VERSION=${V}-${BOOT_PARSED}-debian_bookworm-base_image-$(shell /bin/date -u "+%Y%m%d")
@@ -215,17 +214,6 @@ linux-${LINUX_VER}/arch/arm/boot/zImage: linux-${LINUX_VER}.tar.xz
215214
make -j${JOBS} nxp/imx/${IMX}-usbarmory-tzns.dtb; \
216215
fi
217216

218-
#### mxc-scc2 ####
219-
220-
mxc-scc2-master.zip:
221-
wget ${MXC_SCC2_REPO}/archive/master.zip -O mxc-scc2-master.zip
222-
223-
mxc-scc2-master: mxc-scc2-master.zip
224-
unzip -o mxc-scc2-master.zip
225-
226-
mxc-scc2-master/mxc-scc2.ko: mxc-scc2-master linux-${LINUX_VER}/arch/arm/boot/zImage
227-
cd mxc-scc2-master && make KBUILD_BUILD_USER=${KBUILD_BUILD_USER} KBUILD_BUILD_HOST=${KBUILD_BUILD_HOST} ARCH=arm CROSS_COMPILE=${CROSS_COMPILE} KERNEL_SRC=../linux-${LINUX_VER} -j${JOBS} all
228-
229217
#### mxs-dcp ####
230218

231219
mxs-dcp-${MXS_DCP_BRANCH}.zip:
@@ -255,14 +243,12 @@ extra-dtb: linux-${LINUX_VER}/arch/arm/boot/zImage
255243
wget ${USBARMORY_REPO}/software/kernel_conf/mark-one/imx53-usbarmory-gpio.dts -O linux-${LINUX_VER}/arch/arm/boot/dts/nxp/imx/imx53-usbarmory-gpio.dts
256244
wget ${USBARMORY_REPO}/software/kernel_conf/mark-one/imx53-usbarmory-spi.dts -O linux-${LINUX_VER}/arch/arm/boot/dts/nxp/imx/imx53-usbarmory-spi.dts
257245
wget ${USBARMORY_REPO}/software/kernel_conf/mark-one/imx53-usbarmory-i2c.dts -O linux-${LINUX_VER}/arch/arm/boot/dts/nxp/imx/imx53-usbarmory-i2c.dts
258-
wget ${USBARMORY_REPO}/software/kernel_conf/mark-one/imx53-usbarmory-scc2.dts -O linux-${LINUX_VER}/arch/arm/boot/dts/nxp/imx/imx53-usbarmory-scc2.dts
259-
cd linux-${LINUX_VER} && KBUILD_BUILD_USER=${KBUILD_BUILD_USER} KBUILD_BUILD_HOST=${KBUILD_BUILD_HOST} LOCALVERSION=${LOCALVERSION} ARCH=arm CROSS_COMPILE=${CROSS_COMPILE} make -j${JOBS} nxp/imx/imx53-usbarmory-host.dtb nxp/imx/imx53-usbarmory-gpio.dtb nxp/imx/imx53-usbarmory-spi.dtb nxp/imx/imx53-usbarmory-i2c.dtb nxp/imx/imx53-usbarmory-scc2.dtb
246+
cd linux-${LINUX_VER} && KBUILD_BUILD_USER=${KBUILD_BUILD_USER} KBUILD_BUILD_HOST=${KBUILD_BUILD_HOST} LOCALVERSION=${LOCALVERSION} ARCH=arm CROSS_COMPILE=${CROSS_COMPILE} make -j${JOBS} nxp/imx/imx53-usbarmory-host.dtb nxp/imx/imx53-usbarmory-gpio.dtb nxp/imx/imx53-usbarmory-spi.dtb nxp/imx/imx53-usbarmory-i2c.dtb
260247

261248
#### linux-image-deb ####
262249

263250
KERNEL_DEPS := linux-${LINUX_VER}/arch/arm/boot/zImage
264251
ifeq ($(V),mark-one)
265-
KERNEL_DEPS += mxc-scc2-master/mxc-scc2.ko
266252
KERNEL_DEPS += extra-dtb
267253
endif
268254
ifeq ($(V),mark-two)
@@ -294,8 +280,6 @@ linux-image-${LINUX_VER_MAJOR}-usbarmory-${V}_${LINUX_VER}${LOCALVERSION}_armhf.
294280
cp -r linux-${LINUX_VER}/arch/arm/boot/dts/nxp/imx/${IMX}-usbarmory-spi.dtb linux-image-${LINUX_VER_MAJOR}-usbarmory-${V}_${LINUX_VER}${LOCALVERSION}_armhf/boot/${IMX}-usbarmory-spi-${LINUX_VER}${LOCALVERSION}.dtb; \
295281
cp -r linux-${LINUX_VER}/arch/arm/boot/dts/nxp/imx/${IMX}-usbarmory-gpio.dtb linux-image-${LINUX_VER_MAJOR}-usbarmory-${V}_${LINUX_VER}${LOCALVERSION}_armhf/boot/${IMX}-usbarmory-gpio-${LINUX_VER}${LOCALVERSION}.dtb; \
296282
cp -r linux-${LINUX_VER}/arch/arm/boot/dts/nxp/imx/${IMX}-usbarmory-i2c.dtb linux-image-${LINUX_VER_MAJOR}-usbarmory-${V}_${LINUX_VER}${LOCALVERSION}_armhf/boot/${IMX}-usbarmory-i2c-${LINUX_VER}${LOCALVERSION}.dtb; \
297-
cp -r linux-${LINUX_VER}/arch/arm/boot/dts/nxp/imx/${IMX}-usbarmory-scc2.dtb linux-image-${LINUX_VER_MAJOR}-usbarmory-${V}_${LINUX_VER}${LOCALVERSION}_armhf/boot/${IMX}-usbarmory-scc2-${LINUX_VER}${LOCALVERSION}.dtb; \
298-
cd mxc-scc2-master && make INSTALL_MOD_PATH=../linux-image-${LINUX_VER_MAJOR}-usbarmory-${V}_${LINUX_VER}${LOCALVERSION}_armhf ARCH=arm KERNEL_SRC=../linux-${LINUX_VER} modules_install; \
299283
fi
300284
@if test "${IMX}" = "imx6ulz"; then \
301285
cp -r linux-${LINUX_VER}/arch/arm/boot/dts/nxp/imx/${IMX}-usbarmory-tzns.dtb linux-image-${LINUX_VER_MAJOR}-usbarmory-${V}_${LINUX_VER}${LOCALVERSION}_armhf/boot/${IMX}-usbarmory-tzns-${LINUX_VER}${LOCALVERSION}.dtb ; \
@@ -407,7 +391,7 @@ crucible_${CRUCIBLE_VER}_armhf.deb: crucible-${CRUCIBLE_VER}/crucible
407391
#### targets ####
408392

409393
.PHONY: u-boot debian debian-xz linux linux-image-deb linux-headers-deb
410-
.PHONY: mxs-dcp mxc-scc2 caam-keyblob armoryctl armoryctl-deb crucible crucible-deb
394+
.PHONY: mxs-dcp caam-keyblob armoryctl armoryctl-deb crucible crucible-deb
411395

412396
u-boot: u-boot-${UBOOT_VER}/u-boot.bin
413397
debian: usbarmory-${IMG_VERSION}.raw
@@ -416,7 +400,6 @@ linux: linux-${LINUX_VER}/arch/arm/boot/zImage
416400
linux-image-deb: linux-image-${LINUX_VER_MAJOR}-usbarmory-${V}_${LINUX_VER}${LOCALVERSION}_armhf.deb
417401
linux-headers-deb: linux-headers-${LINUX_VER_MAJOR}-usbarmory-${V}_${LINUX_VER}${LOCALVERSION}_armhf.deb
418402
mxs-dcp: mxs-dcp-${MXS_DCP_BRANCH}/mxs-dcp.ko
419-
mxc-scc2: mxc-scc2-master/mxc-scc2.ko
420403
caam-keyblob: caam-keyblob-${CAAM_KEYBLOB_BRANCH}/caam_keyblob.ko
421404
armoryctl: armoryctl-${ARMORYCTL_VER}/armoryctl
422405
armoryctl-deb: armoryctl_${ARMORYCTL_VER}_armhf.deb
@@ -428,7 +411,7 @@ release: usbarmory-${IMG_VERSION}.raw.xz
428411

429412
clean:
430413
-rm -fr armoryctl* crucible* linux-* linux-image-* linux-headers-* u-boot-*
431-
-rm -fr mxc-scc2-master* mxs-dcp* caam-keyblob*
414+
-rm -fr mxs-dcp* caam-keyblob*
432415
-rm -f usbarmory-*.raw
433416
-sudo rm -fr tmp-rootfs
434417
-sudo umount -f rootfs

0 commit comments

Comments
 (0)