mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-04 04:00:33 +00:00
Adjust patches for Z28PRO, temporally disable broken (u-boot) DEV builds on RK3328, but fix kernel tag to certain (last release) good working one, bump with version
This commit is contained in:
Igor Pecovnik
parent
5eaa80faa2
commit
332ebdd67e
5 changed files with 20 additions and 37 deletions
|
|
@ -6,7 +6,7 @@ BOOTCONFIG="roc-rk3328-cc_defconfig"
|
|||
MODULES=""
|
||||
MODULES_NEXT=""
|
||||
#
|
||||
KERNEL_TARGET="default,dev"
|
||||
KERNEL_TARGET="default"
|
||||
CLI_TARGET=""
|
||||
DESKTOP_TARGET=""
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ BOOTCONFIG="rock64-rk3328_defconfig"
|
|||
MODULES=""
|
||||
MODULES_NEXT=""
|
||||
#
|
||||
KERNEL_TARGET="default,dev"
|
||||
KERNEL_TARGET="default"
|
||||
CLI_TARGET=""
|
||||
DESKTOP_TARGET="stretch:default"
|
||||
#
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ case $BRANCH in
|
|||
BOOTBRANCH='branch:mainline-master'
|
||||
|
||||
KERNELSOURCE='https://github.com/ayufan-rock64/linux-mainline-kernel'
|
||||
KERNELBRANCH='branch:linux-4.17.y'
|
||||
KERNELBRANCH='tag:4.17.0-rc6-1019-ayufan'
|
||||
KERNELDIR='linux-rk3328-mainline'
|
||||
KERNEL_USE_GCC='> 7.0'
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
# common options
|
||||
# daily beta build contains date in subrevision
|
||||
if [[ $BETA == yes && -z $SUBREVISION ]]; then SUBREVISION="."$(date --date="tomorrow" +"%y%m%d"); fi
|
||||
REVISION="5.50$SUBREVISION" # all boards have same revision
|
||||
REVISION="5.51$SUBREVISION" # all boards have same revision
|
||||
ROOTPWD="1234" # Must be changed @first login
|
||||
MAINTAINER="Igor Pecovnik" # deb signature
|
||||
MAINTAINERMAIL="igor.pecovnik@****l.com" # deb signature
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ index d19d609..5c72488 100644
|
|||
+++ b/arch/arm/dts/rk3328-rock64.dts
|
||||
@@ -17,7 +17,7 @@
|
||||
};
|
||||
|
||||
|
||||
aliases {
|
||||
- spi0 = &spi0;
|
||||
+ mmc1 = &sdmmc_ext;
|
||||
};
|
||||
|
||||
|
||||
gmac_clkin: external-gmac-clock {
|
||||
@@ -37,7 +37,7 @@
|
||||
vcc3v3_sdmmc: sdmmc-pwren {
|
||||
|
|
@ -20,17 +20,16 @@ index d19d609..5c72488 100644
|
|||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
};
|
||||
@@ -75,17 +75,17 @@
|
||||
@@ -75,16 +75,16 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
-&sdmmc {
|
||||
+&sdmmc_ext {
|
||||
u-boot,dm-spl;
|
||||
bus-width = <4>;
|
||||
cap-mmc-highspeed;
|
||||
cap-sd-highspeed;
|
||||
fifo-mode;
|
||||
- card-detect-delay = <200>;
|
||||
+ cd-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>;
|
||||
disable-wp;
|
||||
|
|
@ -40,11 +39,11 @@ index d19d609..5c72488 100644
|
|||
+ pinctrl-0 = <&sdmmc0ext_clk>, <&sdmmc0ext_cmd>, <&sdmmc0ext_dectn>, <&sdmmc0ext_bus4>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -270,58 +270,6 @@
|
||||
|
||||
@@ -268,42 +268,6 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
-&spi0 {
|
||||
- u-boot,dm-spl;
|
||||
- status = "okay";
|
||||
|
|
@ -63,43 +62,27 @@ index d19d609..5c72488 100644
|
|||
- #address-cells = <1>;
|
||||
- #size-cells = <1>;
|
||||
-
|
||||
- system@0 {
|
||||
- label = "system";
|
||||
- reg = <0x0 0x8000>;
|
||||
- read-only;
|
||||
- };
|
||||
-
|
||||
- loader@8000 {
|
||||
- label = "loader";
|
||||
- reg = <0x8000 0x3F8000>;
|
||||
- reg = <0x8000 0x3F0000>;
|
||||
- };
|
||||
-
|
||||
- reserved@400000 {
|
||||
- label = "reserved";
|
||||
- reg = <0x400000 0x3C0000>;
|
||||
- read-only;
|
||||
- env@3f8000 {
|
||||
- label = "env";
|
||||
- reg = <0x3F8000 0x8000>;
|
||||
- };
|
||||
-
|
||||
- vendor@7c0000 {
|
||||
- label = "vendor";
|
||||
- reg = <0x7C0000 0x40000>;
|
||||
- };
|
||||
-
|
||||
- uboot@800000 {
|
||||
- label = "uboot";
|
||||
- reg = <0x800000 0x400000>;
|
||||
- };
|
||||
-
|
||||
- atf@c00000 {
|
||||
- label = "atf";
|
||||
- reg = <0xC00000 0x400000>;
|
||||
- };
|
||||
- };
|
||||
- };
|
||||
-};
|
||||
|
||||
-
|
||||
&pinctrl {
|
||||
pmic {
|
||||
pmic_int_l: pmic-int-l {
|
||||
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h b/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
|
||||
index a396510..260117b 100644
|
||||
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
|
||||
|
|
@ -107,7 +90,7 @@ index a396510..260117b 100644
|
|||
@@ -361,6 +361,17 @@ enum {
|
||||
GPIO2D4_SEL_MASK = 0xff << GPIO2D4_SEL_SHIFT,
|
||||
GPIO2D4_EMMC_DATA1234 = 0xaa,
|
||||
|
||||
|
||||
+ /* GPIO3AL_IOMUX */
|
||||
+ GPIO3A0_SEL_SHIFT = 0,
|
||||
+ GPIO3A0_SEL_MASK = 0x71ff << GPIO3A0_SEL_SHIFT,
|
||||
|
|
@ -129,7 +112,7 @@ index f1db5bf..b627083 100644
|
|||
@@ -96,11 +96,10 @@ int board_init(void)
|
||||
#define GRF_BASE 0xff100000
|
||||
struct rk3328_grf_regs * const grf = (void *)GRF_BASE;
|
||||
|
||||
|
||||
- /* uart2 select m1, sdcard select m1*/
|
||||
+ /* uart2 select m1, no sdcard select, because we use sdmmc_ext */
|
||||
rk_clrsetreg(&grf->com_iomux,
|
||||
|
|
@ -138,7 +121,7 @@ index f1db5bf..b627083 100644
|
|||
- IOMUX_SEL_SDMMC_M1 << IOMUX_SEL_SDMMC_SHIFT);
|
||||
+ IOMUX_SEL_UART2_MASK,
|
||||
+ IOMUX_SEL_UART2_M1 << IOMUX_SEL_UART2_SHIFT);
|
||||
|
||||
|
||||
ret = regulators_enable_boot_on(false);
|
||||
if (ret)
|
||||
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue