diff --git a/Makefile b/Makefile index 20734b2..b5db176 100644 --- a/Makefile +++ b/Makefile @@ -4,13 +4,13 @@ CROSS_FLAGS_BOOT = CROSS_COMPILE=aarch64-linux-gnu- all: pine64-pinephone.img.xz pine64-pinetab.img.xz -pine64-pinephone.img: fat-pine64-pinephone.img u-boot-sunxi-with-spl.bin +pine64-pinephone.img: fat-pine64-pinephone.img u-boot-sunxi-with-spl-pinephone.bin rm -f $@ truncate --size 50M $@ parted -s $@ mktable msdos parted -s $@ mkpart primary fat32 2048s 100% parted -s $@ set 1 boot on - dd if=u-boot-sunxi-with-spl.bin of=$@ bs=8k seek=1 + dd if=u-boot-sunxi-with-spl-pinephone.bin of=$@ bs=8k seek=1 dd if=fat-$@ of=$@ seek=1024 bs=1k fat-pine64-pinephone.img: initramfs-pine64-pinephone.gz kernel-sunxi.gz pine64-pinephone.scr dtbs/sunxi/sun50i-a64-pinephone-1.2.dtb @@ -26,13 +26,13 @@ fat-pine64-pinephone.img: initramfs-pine64-pinephone.gz kernel-sunxi.gz pine64-p @mcopy -i $@ initramfs-pine64-pinephone.gz ::initramfs.gz @mcopy -i $@ pine64-pinephone.scr ::boot.scr -pine64-pinetab.img: fat-pine64-pinetab.img u-boot-sunxi-with-spl.bin +pine64-pinetab.img: fat-pine64-pinetab.img u-boot-sunxi-with-spl-pinetab.bin rm -f $@ truncate --size 50M $@ parted -s $@ mktable msdos parted -s $@ mkpart primary fat32 2048s 100% parted -s $@ set 1 boot on - dd if=u-boot-sunxi-with-spl.bin of=$@ bs=8k seek=1 + dd if=u-boot-sunxi-with-spl-pinetab.bin of=$@ bs=8k seek=1 dd if=fat-$@ of=$@ seek=1024 bs=1k fat-pine64-pinetab.img: initramfs-pine64-pinetab.gz kernel-sunxi.gz pine64-pinetab.scr dtbs/sunxi/sun50i-a64-pinetab.dtb @@ -130,13 +130,20 @@ build/atf/sun50i_a64/bl31.bin: src/arm-trusted-firmware @cd src/arm-trusted-firmware; make $(CROSS_FLAGS_BOOT) PLAT=sun50i_a64 bl31 @cp src/arm-trusted-firmware/build/sun50i_a64/release/bl31.bin "$@" -u-boot-sunxi-with-spl.bin: build/atf/sun50i_a64/bl31.bin src/u-boot +u-boot-sunxi-with-spl-pinephone.bin: build/atf/sun50i_a64/bl31.bin src/u-boot @echo "MAKE $@" @mkdir -p build/u-boot/sun50i_a64 @BL31=../../../build/atf/sun50i_a64/bl31.bin $(MAKE) -C src/u-boot O=../../build/u-boot/sun50i_a64 $(CROSS_FLAGS_BOOT) pinephone_defconfig @BL31=../../../build/atf/sun50i_a64/bl31.bin $(MAKE) -C src/u-boot O=../../build/u-boot/sun50i_a64 $(CROSS_FLAGS_BOOT) ARCH=arm all @cp build/u-boot/sun50i_a64/u-boot-sunxi-with-spl.bin "$@" +u-boot-sunxi-with-spl-pinetab.bin: build/atf/sun50i_a64/bl31.bin src/u-boot + @echo "MAKE $@" + @mkdir -p build/u-boot/sun50i_a64 + @BL31=../../../build/atf/sun50i_a64/bl31.bin $(MAKE) -C src/u-boot O=../../build/u-boot/sun50i_a64 $(CROSS_FLAGS_BOOT) pinetab_defconfig + @BL31=../../../build/atf/sun50i_a64/bl31.bin $(MAKE) -C src/u-boot O=../../build/u-boot/sun50i_a64 $(CROSS_FLAGS_BOOT) ARCH=arm all + @cp build/u-boot/sun50i_a64/u-boot-sunxi-with-spl.bin "$@" + build/atf/rk3399/bl31.elf: src/arm-trusted-firmware @echo "MAKE $@" @mkdir -p build/atf/rk3399 diff --git a/src/0001-isun50i-a64-Add-PinePhone-DTS-and-defconfig.patch b/src/0001-isun50i-a64-Add-PinePhone-DTS-and-defconfig.patch index 6bec818..0501859 100644 --- a/src/0001-isun50i-a64-Add-PinePhone-DTS-and-defconfig.patch +++ b/src/0001-isun50i-a64-Add-PinePhone-DTS-and-defconfig.patch @@ -38,7 +38,7 @@ index 0000000000..dc4ab6b434 +/dts-v1/; + +#include "sun50i-a64.dtsi" -+#include "sun50i-a64-cpu-opp.dtsi" ++/* #include "sun50i-a64-cpu-opp.dtsi" */ + +#include +#include @@ -74,7 +74,7 @@ index 0000000000..dc4ab6b434 + #address-cells = <1>; + #size-cells = <0>; + -+ /* Rear camera */ ++ /* Rear camera */ /* + ov5640: camera@3c { + compatible = "ovti,ov5640"; + reg = <0x3c>; @@ -86,20 +86,20 @@ index 0000000000..dc4ab6b434 + AVDD-supply = <®_dldo3>; + DOVDD-supply = <®_aldo1>; + DVDD-supply = <®_eldo3>; -+ reset-gpios = <&pio 4 14 GPIO_ACTIVE_LOW>; /* PE14 */ -+ powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; /* PE15 */ ++ reset-gpios = <&pio 4 14 GPIO_ACTIVE_LOW>; /* PE14 */ /* ++ powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; /* PE15 */ /* + + port { + ov5640_ep: endpoint { + remote-endpoint = <&csi_ep>; + bus-width = <8>; -+ hsync-active = <1>; /* Active high */ -+ vsync-active = <0>; /* Active low */ -+ data-active = <1>; /* Active high */ -+ pclk-sample = <1>; /* Rising */ ++ hsync-active = <1>; /* Active high */ /* ++ vsync-active = <0>; /* Active low */ /* ++ data-active = <1>; /* Active high */ /* ++ pclk-sample = <1>; /* Rising */ /* + }; + }; -+ }; ++ }; */ + }; + + speaker_amp: audio-amplifier { @@ -124,14 +124,14 @@ index 0000000000..dc4ab6b434 + }; +}; + -+&codec { ++/* &codec { + status = "okay"; +}; + +&codec_analog { + cpvdd-supply = <®_eldo1>; + status = "okay"; -+}; ++}; */ + +&cpu0 { + cpu-supply = <®_dcdc2>; @@ -149,7 +149,7 @@ index 0000000000..dc4ab6b434 + cpu-supply = <®_dcdc2>; +}; + -+&csi { ++/* &csi { + status = "okay"; + + port { @@ -159,10 +159,10 @@ index 0000000000..dc4ab6b434 + csi_ep: endpoint { + remote-endpoint = <&ov5640_ep>; + bus-width = <8>; -+ hsync-active = <1>; /* Active high */ -+ vsync-active = <0>; /* Active low */ -+ data-active = <1>; /* Active high */ -+ pclk-sample = <1>; /* Rising */ ++ hsync-active = <1>; /* Active high */ /* ++ vsync-active = <0>; /* Active low */ /* ++ data-active = <1>; /* Active high */ /* ++ pclk-sample = <1>; /* Rising */ /* + }; + }; +}; @@ -189,10 +189,10 @@ index 0000000000..dc4ab6b434 + avdd-supply = <®_dc1sw>; + dvdd-supply = <®_dc1sw>; + cvdd-supply = <®_ldo_io1>; -+ reset-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */ ++ reset-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */ /* + backlight = <&backlight>; + }; -+}; ++}; */ + +&ehci0 { + status = "okay"; @@ -226,7 +226,7 @@ index 0000000000..dc4ab6b434 + /* TODO: add Bochs BMA223 accelerometer here */ +}; + -+&lradc { ++/* &lradc { + vref-supply = <®_aldo3>; + status = "okay"; + @@ -243,7 +243,7 @@ index 0000000000..dc4ab6b434 + channel = <0>; + voltage = <400000>; + }; -+}; ++}; */ + +&mixer1 { + status = "okay"; @@ -307,13 +307,13 @@ index 0000000000..dc4ab6b434 + +#include "axp803.dtsi" + -+&ac_power_supply { ++/* &ac_power_supply { + status = "okay"; +}; + +&battery_power_supply { + status = "okay"; -+}; ++}; */ + +®_aldo1 { + regulator-min-microvolt = <2800000>; @@ -353,7 +353,7 @@ index 0000000000..dc4ab6b434 + regulator-name = "vdd-cpux"; +}; + -+/* DCDC3 is polyphased with DCDC2 */ ++/* DCDC3 is polyphased with DCDC2 */ /* + +®_dcdc5 { + regulator-always-on; @@ -444,7 +444,7 @@ index 0000000000..dc4ab6b434 + regulator-name = "vcc-rtc"; +}; + -+&sound { ++/* &sound { + status = "okay"; + simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>; + simple-audio-card,widgets = "Microphone", "Internal Microphone Left", @@ -465,7 +465,7 @@ index 0000000000..dc4ab6b434 + "MIC1", "Internal Microphone Left", + "Internal Microphone Right", "HBIAS", + "MIC2", "Internal Microphone Right"; -+}; ++}; */ + +&uart0 { + pinctrl-names = "default"; @@ -478,17 +478,17 @@ index 0000000000..dc4ab6b434 + status = "okay"; +}; + -+&usb_power_supply { ++/* &usb_power_supply { + status = "okay"; +}; + +&usbphy { -+ usb0_id_det-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ ++ usb0_id_det-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ /* + usb0_vbus_power-supply = <&usb_power_supply>; + usb0_vbus-supply = <®_drivevbus>; + usb1_vbus-supply = <®_ldo_io0>; + status = "okay"; -+}; ++}; */ diff --git a/configs/pinetab_defconfig b/configs/pinetab_defconfig new file mode 100644 index 0000000000..350465a425