diff --git a/config/boards/bananapim2plus.conf b/config/boards/bananapim2plus.conf index 6bf3869292..ed97d67690 100644 --- a/config/boards/bananapim2plus.conf +++ b/config/boards/bananapim2plus.conf @@ -2,7 +2,7 @@ BOARD_NAME="Banana Pi M2+" LINUXFAMILY=sun8i BOOTCONFIG=Sinovoip_BPI_M2_plus_defconfig -MODULES="#gpio-sunxi #w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp" +MODULES="#gpio-sunxi #w1-sunxi #w1-gpio #w1-therm #sunxi-cir dhd hci_uart rfcomm hidp" MODULES_NEXT="brcmfmac" CPUMIN=240000 CPUMAX=1200000 diff --git a/config/boards/nanopiair.conf b/config/boards/nanopiair.conf index f617e58459..25ad8c06ef 100644 --- a/config/boards/nanopiair.conf +++ b/config/boards/nanopiair.conf @@ -1,8 +1,8 @@ # H3 quad core 256/512MB SoC Headless WiFi/BT BOARD_NAME="NanoPi Air" LINUXFAMILY=sun8i -BOOTCONFIG=FriendlyARM_NanoPi_NEO_defconfig -MODULES="#gpio-sunxi #w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp bcmdhd" +BOOTCONFIG=FriendlyARM_NanoPi_Air_defconfig +MODULES="#gpio-sunxi #w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_serial" MODULES_NEXT="brcmfmac" CPUMIN=240000 CPUMAX=912000 diff --git a/config/fex/nanopiair.fex b/config/fex/nanopiair.fex index 61b97e510a..87d5e755d8 100644 --- a/config/fex/nanopiair.fex +++ b/config/fex/nanopiair.fex @@ -361,53 +361,55 @@ pwm_positive = port:PA05<3><0> gmac_used = 0 gmac_power1 = +; to use other camera modules please refer to +; http://forum.armbian.com/index.php/topic/1213-ov5640-camera-with-orange-pi/ [csi0] -vip_used = 0 -vip_mode = 0 -vip_dev_qty = 1 -vip_define_sensor_list = 0 -vip_csi_pck = port:PE00<2> -vip_csi_mck = port:PE01<2> -vip_csi_hsync = port:PE02<2> -vip_csi_vsync = port:PE03<2> -vip_csi_d0 = port:PE04<2> -vip_csi_d1 = port:PE05<2> -vip_csi_d2 = port:PE06<2> -vip_csi_d3 = port:PE07<2> -vip_csi_d4 = port:PE08<2> -vip_csi_d5 = port:PE09<2> -vip_csi_d6 = port:PE10<2> -vip_csi_d7 = port:PE11<2> -vip_csi_sck = port:PE12<2> -vip_csi_sda = port:PE13<2> -vip_dev0_mname = "gc2035" -vip_dev0_pos = "front" -vip_dev0_lane = 1 -vip_dev0_twi_id = 2 -vip_dev0_twi_addr = 120 -vip_dev0_isp_used = 0 -vip_dev0_fmt = 0 -vip_dev0_stby_mode = 0 -vip_dev0_vflip = 1 -vip_dev0_hflip = 1 -vip_dev0_iovdd = "" -vip_dev0_iovdd_vol = 2800000 -vip_dev0_avdd = "" -vip_dev0_avdd_vol = 2800000 -vip_dev0_dvdd = "" -vip_dev0_dvdd_vol = 1800000 -vip_dev0_afvdd = "" -vip_dev0_afvdd_vol = 2800000 -vip_dev0_power_en = port:PA17<1><1> -vip_dev0_reset = port:PE14<1><1> -vip_dev0_pwdn = port:PE15<1><0> -vip_dev0_flash_en = -vip_dev0_flash_mode = -vip_dev0_af_pwdn = -vip_dev0_act_used = 0 -vip_dev0_act_name = "ad5820_act" -vip_dev0_act_slave = 24 -vip_dev1_mname = "" +vip_used = 1 +vip_mode = 0 +vip_dev_qty = 1 +vip_define_sensor_list = 0 +vip_csi_pck = port:PE00<2> +vip_csi_mck = port:PE01<2> +vip_csi_hsync = port:PE02<2> +vip_csi_vsync = port:PE03<2> +vip_csi_d0 = port:PE04<2> +vip_csi_d1 = port:PE05<2> +vip_csi_d2 = port:PE06<2> +vip_csi_d3 = port:PE07<2> +vip_csi_d4 = port:PE08<2> +vip_csi_d5 = port:PE09<2> +vip_csi_d6 = port:PE10<2> +vip_csi_d7 = port:PE11<2> +vip_csi_sck = port:PE12<2> +vip_csi_sda = port:PE13<2> +vip_dev0_mname = "ov5640" +vip_dev0_pos = "rear" +vip_dev0_lane = 4 +vip_dev0_twi_id = 2 +vip_dev0_twi_addr = 0x78 +vip_dev0_isp_used = 1 +vip_dev0_fmt = 0 +vip_dev0_stby_mode = 1 +vip_dev0_vflip = 1 +vip_dev0_hflip = 0 +vip_dev0_iovdd = "" +vip_dev0_iovdd_vol = 2800000 +vip_dev0_avdd = "" +vip_dev0_avdd_vol = 2800000 +vip_dev0_dvdd = "" +vip_dev0_dvdd_vol = 1500000 +vip_dev0_afvdd = "" +vip_dev0_afvdd_vol = 2800000 +;vip_dev0_power_en = port:PD14<1> +vip_dev0_power_en = +vip_dev0_reset = port:PE14<1> +vip_dev0_pwdn = port:PE15<1> +vip_dev0_flash_en = +vip_dev0_flash_mode = +vip_dev0_af_pwdn = +vip_dev0_act_used = 0 +vip_dev0_act_name = "ad5820_act" +vip_dev0_act_slave = 0x18 vip_dev1_pos = "rear" vip_dev1_lane = 1 vip_dev1_twi_id = 0 diff --git a/config/sources/sun8i.conf b/config/sources/sun8i.conf index 528c09625d..0cc47546e1 100644 --- a/config/sources/sun8i.conf +++ b/config/sources/sun8i.conf @@ -32,7 +32,7 @@ family_tweaks() cp $SRC/lib/config/asound.state.sun8i-default $CACHEDIR/sdcard/var/lib/alsa/asound.state fi # enable serial gadget on OTG port since the board doesn't have Ethernet - if [[ $BOARD == orangepilite && $BRANCH == default && ( $RELEASE == jessie || $RELEASE == xenial ) ]]; then + if [[ ( $BOARD == orangepilite || $BOARD == nanopiair ) && $BRANCH == default && ( $RELEASE == jessie || $RELEASE == xenial ) ]]; then mkdir -p $CACHEDIR/sdcard/etc/systemd/system/serial-getty@ttyGS0.service.d cat <<-EOF > $CACHEDIR/sdcard/etc/systemd/system/serial-getty@ttyGS0.service.d/10-switch-role.conf [Service] diff --git a/patch/u-boot/u-boot-default/add-missing-h3-boards.patch b/patch/u-boot/u-boot-default/add-missing-h3-boards.patch index 345cf83c30..4e9b1b5f69 100644 --- a/patch/u-boot/u-boot-default/add-missing-h3-boards.patch +++ b/patch/u-boot/u-boot-default/add-missing-h3-boards.patch @@ -39,6 +39,27 @@ index 0000000..4e7f0e4 +CONFIG_SUN8I_EMAC=y +CONFIG_USB_EHCI_HCD=y +CONFIG_SYS_CLK_FREQ=480000000 +diff --git a/configs/FriendlyARM_NanoPi_NEO_defconfig b/configs/FriendlyARM_NanoPi_Air_defconfig +new file mode 100644 +index 0000000..4e7f0e4 +--- /dev/null ++++ b/configs/FriendlyARM_NanoPi_Air_defconfig +@@ -0,0 +1,15 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN8I_H3=y ++CONFIG_DRAM_CLK=408 ++CONFIG_DRAM_ZQ=3881979 ++CONFIG_DRAM_ODT_EN=y ++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-one" ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_SPL=y ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_FLASH is not set ++# CONFIG_CMD_FPGA is not set ++CONFIG_USB_EHCI_HCD=y ++CONFIG_SYS_CLK_FREQ=480000000 ++CONFIG_MMC_SUNXI_SLOT_EXTRA=2 diff --git a/configs/Sinovoip_BPI_M2_plus_defconfig b/configs/Sinovoip_BPI_M2_plus_defconfig new file mode 100644 index 0000000..5ba9f9e