diff --git a/patch.sh b/patch.sh index 652243df95e62a5e350e71bc54de78db12168e05..2e9d23972c7f81b3fb7411f93ff6f2129f9edde4 100644 --- a/patch.sh +++ b/patch.sh @@ -135,7 +135,7 @@ patch -s -p1 < "${DIR}/patches/panda/0001-panda-fix-wl12xx-regulator.patch" function fixes { echo "generic fixes" -git am "${DIR}/patches/fixes/0001-OMAP-UART-Enable-tx-wakeup-bit-in-wer.patch" +#git am "${DIR}/patches/fixes/0001-OMAP-UART-Enable-tx-wakeup-bit-in-wer.patch" #git am "${DIR}/patches/fixes/0001-ARM-OMAP-AM3517-3505-fix-crash-on-boot-due-to-incorr.patch" #git am "${DIR}/patches/fixes/0001-ARM-OMAP4-hwmod-Don-t-wait-for-the-idle-status-if-mo.patch" diff --git a/patches/defconfig b/patches/defconfig index ebba5d6dc55a61c317179aec0a7798672589c7ed..994c586494b4d7e5db0b87ce8b2bc77aaf11c93c 100644 --- a/patches/defconfig +++ b/patches/defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.3.0-rc1 Kernel Configuration +# Linux/arm 3.3.0-rc2 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -438,7 +438,8 @@ CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y CONFIG_CACHE_L2X0=y CONFIG_CACHE_PL310=y -CONFIG_ARM_L1_CACHE_SHIFT=5 +CONFIG_ARM_L1_CACHE_SHIFT_6=y +CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_ARM_NR_BANKS=8 CONFIG_MULTI_IRQ_HANDLER=y @@ -3472,6 +3473,7 @@ CONFIG_LEDS_GPIO=y # CONFIG_LEDS_LT3593 is not set # CONFIG_LEDS_RENESAS_TPU is not set # CONFIG_LEDS_TCA6507 is not set +# CONFIG_LEDS_OT200 is not set CONFIG_LEDS_TRIGGERS=y # diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig index 3310cd8aca6e5430edf802e3b6251f5c6d4001a1..66b38b433d52cb2498161ed5a9419bfb7e3f394d 100644 --- a/patches/ref_omap2plus_defconfig +++ b/patches/ref_omap2plus_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.3.0-rc1 Kernel Configuration +# Linux/arm 3.3.0-rc2 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -418,7 +418,8 @@ CONFIG_ARM_THUMBEE=y CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y CONFIG_CACHE_L2X0=y -CONFIG_ARM_L1_CACHE_SHIFT=5 +CONFIG_ARM_L1_CACHE_SHIFT_6=y +CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_ARM_NR_BANKS=8 CONFIG_MULTI_IRQ_HANDLER=y diff --git a/version.sh b/version.sh index 7388719afbe9c018319b3c3e5dfc0fe31ab835e6..ceb2d1e4e25cfac85f6f382728e6d10219805a3e 100644 --- a/version.sh +++ b/version.sh @@ -9,7 +9,7 @@ KERNEL_REL=3.3 #for x.x-rcX RC_KERNEL=3.3 -RC_PATCH=-rc1 +RC_PATCH=-rc2 ABI=0