From 41e903af81a506ef7204daf5e894706bb3a0004d Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 4 Nov 2016 09:11:50 -0500
Subject: [PATCH] more moving around
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patch.sh | 133 +++++++-----------
.../firmware/0001-add-am33x-firmware.patch | 0
.../0001-ASoC-add-generic-TDM-codec.patch | 0
...oC-davinci_mcasp-20-bit-word-support.patch | 0
...sp-DIT-and-other-fixes-work-in-progr.patch | 0
...-8250_omap.c-use-pr_info-over-pr_err.patch | 0
.../0001-cape-Argus-UPS-cape-support.patch | 0
...oneblack-enable-wl1835mod-cape-suppo.patch | 0
...003-add-am335x-boneblack-bbbmini.dts.patch | 0
...oneblack-bbb-exp-c.dtb-am335x-bonebl.patch | 0
.../0005-bb-audio-cape.patch | 0
version.sh | 2 +-
12 files changed, 53 insertions(+), 82 deletions(-)
rename patches/{beaglebone => drivers/ti}/firmware/0001-add-am33x-firmware.patch (100%)
rename patches/{local => drivers/ti/mcasp}/0001-ASoC-add-generic-TDM-codec.patch (100%)
rename patches/{local => drivers/ti/mcasp}/0002-ASoC-davinci_mcasp-20-bit-word-support.patch (100%)
rename patches/{local => drivers/ti/mcasp}/0003-ASoC-davinci-mcasp-DIT-and-other-fixes-work-in-progr.patch (100%)
rename patches/{quieter => drivers/ti/serial}/0001-quiet-8250_omap.c-use-pr_info-over-pr_err.patch (100%)
rename patches/{beaglebone/capes => soc/ti/beaglebone_capes}/0001-cape-Argus-UPS-cape-support.patch (100%)
rename patches/{beaglebone/capes => soc/ti/beaglebone_capes}/0002-ARM-dts-am335x-boneblack-enable-wl1835mod-cape-suppo.patch (100%)
rename patches/{beaglebone/capes => soc/ti/beaglebone_capes}/0003-add-am335x-boneblack-bbbmini.dts.patch (100%)
rename patches/{beaglebone/capes => soc/ti/beaglebone_capes}/0004-add-lcd-am335x-boneblack-bbb-exp-c.dtb-am335x-bonebl.patch (100%)
rename patches/{beaglebone/capes => soc/ti/beaglebone_capes}/0005-bb-audio-cape.patch (100%)
diff --git a/patch.sh b/patch.sh
index 074648780..11b0ac839 100644
--- a/patch.sh
+++ b/patch.sh
@@ -316,6 +316,10 @@ fixes () {
fi
}
+build () {
+ dir 'build/kbuild'
+}
+
drivers () {
dir 'drivers/spi'
dir 'drivers/pm_bus'
@@ -449,11 +453,56 @@ drivers () {
cleanup
fi
+ echo "dir: drivers/ti/firmware"
+ #regenerate="enable"
+ if [ "x${regenerate}" = "xenable" ] ; then
+ start_cleanup
+ fi
+
+ #http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=summary
+ #git clone git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git
+
+ #cd ti-amx3-cm3-pm-firmware/
+ #git checkout origin/ti-v4.1.y-next -b tmp
+
+ #commit ee4acf427055d7e87d9d1d82296cbd05e388642e
+ #Author: Dave Gerlach <d-gerlach@ti.com>
+ #Date: Tue Sep 6 14:33:11 2016 -0500
+ #
+ # CM3: Firmware release 0x192
+ #
+ # This version, 0x192, includes the following changes:
+ # - Fix DDR IO CTRL handling during suspend so both am335x and am437x
+ # use optimal low power state and restore the exact previous
+ # configuration.
+ # - Explicitly configure PER state in standby, even though it is
+ # configured to ON state to ensure proper state.
+ # - Add new 'halt' flag in IPC_REG4 bit 11 to allow HLOS to configure
+ # the suspend path to wait immediately before suspending the system
+ # entirely to allow JTAG visiblity for debug.
+ # - Fix board voltage scaling binaries i2c speed configuration in
+ # order to properly configure 100khz operation.
+ #
+ # Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
+
+ #cp -v bin/am* /opt/github/bb.org/ti-4.4/normal/KERNEL/firmware/
+
+ #git add -f ./firmware/am*
+
+ ${git} "${DIR}/patches/drivers/ti/firmware/0001-add-am33x-firmware.patch"
+
+ if [ "x${regenerate}" = "xenable" ] ; then
+ number=1
+ cleanup
+ fi
+
dir 'drivers/ti/cpsw'
dir 'drivers/ti/eqep'
+ dir 'drivers/ti/mcasp'
dir 'drivers/ti/mmc'
dir 'drivers/ti/rpmsg'
dir 'drivers/ti/rtc'
+ dir 'drivers/ti/serial'
dir 'drivers/ti/spi'
dir 'drivers/ti/uio'
@@ -498,6 +547,8 @@ soc () {
number=8
cleanup
fi
+
+ dir 'soc/ti/beaglebone_capes'
}
dtb_makefile_append () {
@@ -505,25 +556,6 @@ dtb_makefile_append () {
}
beaglebone () {
- echo "dir: beaglebone/capes"
- #regenerate="enable"
- if [ "x${regenerate}" = "xenable" ] ; then
- start_cleanup
- fi
-
- ${git} "${DIR}/patches/beaglebone/capes/0001-cape-Argus-UPS-cape-support.patch"
- ${git} "${DIR}/patches/beaglebone/capes/0002-ARM-dts-am335x-boneblack-enable-wl1835mod-cape-suppo.patch"
- ${git} "${DIR}/patches/beaglebone/capes/0003-add-am335x-boneblack-bbbmini.dts.patch"
- ${git} "${DIR}/patches/beaglebone/capes/0004-add-lcd-am335x-boneblack-bbb-exp-c.dtb-am335x-bonebl.patch"
- ${git} "${DIR}/patches/beaglebone/capes/0005-bb-audio-cape.patch"
-
- #Replicape use am335x-boneblack-overlay.dtb???
-
- if [ "x${regenerate}" = "xenable" ] ; then
- number=5
- cleanup
- fi
-
#This has to be last...
echo "dir: beaglebone/dtbs"
#regenerate="enable"
@@ -584,78 +616,17 @@ beaglebone () {
else
${git} "${DIR}/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch"
fi
-
- echo "dir: beaglebone/firmware"
- #regenerate="enable"
- if [ "x${regenerate}" = "xenable" ] ; then
- start_cleanup
- fi
-
- #http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=summary
- #git clone git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git
-
- #cd ti-amx3-cm3-pm-firmware/
- #git checkout origin/ti-v4.1.y-next -b tmp
-
- #commit ee4acf427055d7e87d9d1d82296cbd05e388642e
- #Author: Dave Gerlach <d-gerlach@ti.com>
- #Date: Tue Sep 6 14:33:11 2016 -0500
- #
- # CM3: Firmware release 0x192
- #
- # This version, 0x192, includes the following changes:
- # - Fix DDR IO CTRL handling during suspend so both am335x and am437x
- # use optimal low power state and restore the exact previous
- # configuration.
- # - Explicitly configure PER state in standby, even though it is
- # configured to ON state to ensure proper state.
- # - Add new 'halt' flag in IPC_REG4 bit 11 to allow HLOS to configure
- # the suspend path to wait immediately before suspending the system
- # entirely to allow JTAG visiblity for debug.
- # - Fix board voltage scaling binaries i2c speed configuration in
- # order to properly configure 100khz operation.
- #
- # Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
-
- #cp -v bin/am* /opt/github/bb.org/ti-4.4/normal/KERNEL/firmware/
-
- #git add -f ./firmware/am*
-
- ${git} "${DIR}/patches/beaglebone/firmware/0001-add-am33x-firmware.patch"
-
- if [ "x${regenerate}" = "xenable" ] ; then
- number=1
- cleanup
- fi
-}
-
-quieter () {
- echo "dir: quieter"
- #regenerate="enable"
- if [ "x${regenerate}" = "xenable" ] ; then
- start_cleanup
- fi
-
- #quiet some hide obvious things...
- ${git} "${DIR}/patches/quieter/0001-quiet-8250_omap.c-use-pr_info-over-pr_err.patch"
-
- if [ "x${regenerate}" = "xenable" ] ; then
- number=1
- cleanup
- fi
}
###
#backports
reverts
fixes
-dir 'build/kbuild'
+build
drivers
soc
beaglebone
-quieter
dir 'build/gcc'
-dir 'local'
packaging () {
echo "dir: packaging"
diff --git a/patches/beaglebone/firmware/0001-add-am33x-firmware.patch b/patches/drivers/ti/firmware/0001-add-am33x-firmware.patch
similarity index 100%
rename from patches/beaglebone/firmware/0001-add-am33x-firmware.patch
rename to patches/drivers/ti/firmware/0001-add-am33x-firmware.patch
diff --git a/patches/local/0001-ASoC-add-generic-TDM-codec.patch b/patches/drivers/ti/mcasp/0001-ASoC-add-generic-TDM-codec.patch
similarity index 100%
rename from patches/local/0001-ASoC-add-generic-TDM-codec.patch
rename to patches/drivers/ti/mcasp/0001-ASoC-add-generic-TDM-codec.patch
diff --git a/patches/local/0002-ASoC-davinci_mcasp-20-bit-word-support.patch b/patches/drivers/ti/mcasp/0002-ASoC-davinci_mcasp-20-bit-word-support.patch
similarity index 100%
rename from patches/local/0002-ASoC-davinci_mcasp-20-bit-word-support.patch
rename to patches/drivers/ti/mcasp/0002-ASoC-davinci_mcasp-20-bit-word-support.patch
diff --git a/patches/local/0003-ASoC-davinci-mcasp-DIT-and-other-fixes-work-in-progr.patch b/patches/drivers/ti/mcasp/0003-ASoC-davinci-mcasp-DIT-and-other-fixes-work-in-progr.patch
similarity index 100%
rename from patches/local/0003-ASoC-davinci-mcasp-DIT-and-other-fixes-work-in-progr.patch
rename to patches/drivers/ti/mcasp/0003-ASoC-davinci-mcasp-DIT-and-other-fixes-work-in-progr.patch
diff --git a/patches/quieter/0001-quiet-8250_omap.c-use-pr_info-over-pr_err.patch b/patches/drivers/ti/serial/0001-quiet-8250_omap.c-use-pr_info-over-pr_err.patch
similarity index 100%
rename from patches/quieter/0001-quiet-8250_omap.c-use-pr_info-over-pr_err.patch
rename to patches/drivers/ti/serial/0001-quiet-8250_omap.c-use-pr_info-over-pr_err.patch
diff --git a/patches/beaglebone/capes/0001-cape-Argus-UPS-cape-support.patch b/patches/soc/ti/beaglebone_capes/0001-cape-Argus-UPS-cape-support.patch
similarity index 100%
rename from patches/beaglebone/capes/0001-cape-Argus-UPS-cape-support.patch
rename to patches/soc/ti/beaglebone_capes/0001-cape-Argus-UPS-cape-support.patch
diff --git a/patches/beaglebone/capes/0002-ARM-dts-am335x-boneblack-enable-wl1835mod-cape-suppo.patch b/patches/soc/ti/beaglebone_capes/0002-ARM-dts-am335x-boneblack-enable-wl1835mod-cape-suppo.patch
similarity index 100%
rename from patches/beaglebone/capes/0002-ARM-dts-am335x-boneblack-enable-wl1835mod-cape-suppo.patch
rename to patches/soc/ti/beaglebone_capes/0002-ARM-dts-am335x-boneblack-enable-wl1835mod-cape-suppo.patch
diff --git a/patches/beaglebone/capes/0003-add-am335x-boneblack-bbbmini.dts.patch b/patches/soc/ti/beaglebone_capes/0003-add-am335x-boneblack-bbbmini.dts.patch
similarity index 100%
rename from patches/beaglebone/capes/0003-add-am335x-boneblack-bbbmini.dts.patch
rename to patches/soc/ti/beaglebone_capes/0003-add-am335x-boneblack-bbbmini.dts.patch
diff --git a/patches/beaglebone/capes/0004-add-lcd-am335x-boneblack-bbb-exp-c.dtb-am335x-bonebl.patch b/patches/soc/ti/beaglebone_capes/0004-add-lcd-am335x-boneblack-bbb-exp-c.dtb-am335x-bonebl.patch
similarity index 100%
rename from patches/beaglebone/capes/0004-add-lcd-am335x-boneblack-bbb-exp-c.dtb-am335x-bonebl.patch
rename to patches/soc/ti/beaglebone_capes/0004-add-lcd-am335x-boneblack-bbb-exp-c.dtb-am335x-bonebl.patch
diff --git a/patches/beaglebone/capes/0005-bb-audio-cape.patch b/patches/soc/ti/beaglebone_capes/0005-bb-audio-cape.patch
similarity index 100%
rename from patches/beaglebone/capes/0005-bb-audio-cape.patch
rename to patches/soc/ti/beaglebone_capes/0005-bb-audio-cape.patch
diff --git a/version.sh b/version.sh
index 9db121afd..be51a1708 100644
--- a/version.sh
+++ b/version.sh
@@ -28,7 +28,7 @@ toolchain="gcc_linaro_gnueabihf_6"
#Kernel/Build
KERNEL_REL=4.9
KERNEL_TAG=${KERNEL_REL}-rc3
-BUILD=${build_prefix}1.1
+BUILD=${build_prefix}1.2
kernel_rt=".X-rtY"
#v4.X-rcX + upto SHA
--
GitLab