diff --git a/config/boards/nanopim1plus.conf b/config/boards/nanopim1plus.conf new file mode 100644 index 000000000..9f0186951 --- /dev/null +++ b/config/boards/nanopim1plus.conf @@ -0,0 +1,11 @@ +# H3 quad core 1GB SoC WiFi/BT eMMC +BOARD_NAME="NanoPi M1 Plus" +LINUXFAMILY=sun8i +BOOTCONFIG=FriendlyARM_NanoPi_M1_Plus_defconfig +MODULES="#gpio-sunxi #w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd" +MODULES_NEXT="brcmfmac" +CPUMIN=240000 +CPUMAX=1200000 +CLI_TARGET="jessie,xenial:default" +DESKTOP_TARGET="xenial:default" +KERNEL_TARGET="default,dev" diff --git a/config/fex/nanopim1plus.fex b/config/fex/nanopim1plus.fex index d7888b035..337901302 100644 --- a/config/fex/nanopim1plus.fex +++ b/config/fex/nanopim1plus.fex @@ -1,8 +1,16 @@ ; Based on vendor fex in version from 23th Nov 2016 ; https://github.com/friendlyarm/h3_lichee/blob/97e1a057000511abe8ed85adee6c6474398a427c/tools/pack/chips/sun8iw7p1/configs/nanopi-h3/boards/sys_config_nanopi_m1_plus.fex +; +; TODO: +; - check whether FA's fex has changed after release +; - check DRAM reliability with higher clockspeed (576 vs. 624 default) +; - check wifi settings (7 seemed to be false) +; - check for pin mapping collissions (GPIO) +; - check deactivated audio pin PA16 (same situation as with NanoPi Air) +; [product] version = "100" -machine = "nanopi-h3" +machine = "nanopi-m1-plus" [platform] debug_mode = 1 @@ -38,7 +46,7 @@ led_state = 0 [boot_init_gpio] used = 1 -gpio0 = port:PA10<1><1> +gpio0 = port:PL10<1><1> gpio1 = port:PG11<1><1> [recovery_para] @@ -166,14 +174,14 @@ uart_tx = port:PA04<2><1> uart_rx = port:PA05<2><1> [uart1] -uart_used = 1 +uart_used = 0 uart_port = 1 uart_type = 2 uart_tx = port:PG06<2><1> uart_rx = port:PG07<2><1> [uart2] -uart_used = 1 +uart_used = 0 uart_port = 2 uart_type = 4 uart_tx = port:PA00<2><1> @@ -219,31 +227,17 @@ full_duplex = 1 manual_cs = 0 [gpio_para] -gpio_used = 0 -gpio_num = 19 +gpio_used = 1 +gpio_num = 9 gpio_pin_1 = port:PA06<1><0> -gpio_pin_2 = port:PA13<1><0> -gpio_pin_3 = port:PA14<1><0> -gpio_pin_4 = port:PA01<1><0> -gpio_pin_5 = port:PD14<1><0> -gpio_pin_6 = port:PA00<1><0> -gpio_pin_7 = port:PA03<1><0> -gpio_pin_8 = port:PC04<1><0> -gpio_pin_9 = port:PC07<1><0> -gpio_pin_10 = port:PA02<1><0> -gpio_pin_11 = port:PA21<1><0> -gpio_pin_12 = port:PA07<1><0> -gpio_pin_13 = port:PA08<1><0> -gpio_pin_14 = port:PG08<1><0> -gpio_pin_15 = port:PA09<1><0> -gpio_pin_16 = port:PA10<1><0> -gpio_pin_17 = port:PG09<1><0> -gpio_pin_18 = port:PG06<1><0> -gpio_pin_19 = port:PG07<1><0> - -;[led_assign] -;normal_led = "gpio_pin_2" -;standby_led = "gpio_pin_1" +gpio_pin_2 = port:PC04<1><0> +gpio_pin_3 = port:PC07<1><0> +gpio_pin_4 = port:PA02<1><0> +gpio_pin_5 = port:PG08<1><0> +gpio_pin_6 = port:PA09<1><0> +gpio_pin_7 = port:PG09<1><0> +gpio_pin_8 = port:PG06<1><0> +gpio_pin_9 = port:PG07<1><0> [leds_para] leds_used = 1 @@ -253,41 +247,47 @@ blue_led = port:PA10<1><0> blue_led_active_low = 0 [ths_para] -ths_used = 1 -ths_trip1_count = 5 -ths_trip1_0 = 70 -ths_trip1_1 = 80 -ths_trip1_2 = 90 -ths_trip1_3 = 100 -ths_trip1_4 = 105 -ths_trip1_5 = 0 -ths_trip1_6 = 0 -ths_trip1_7 = 0 -ths_trip1_0_min = 0 -ths_trip1_0_max = 1 -ths_trip1_1_min = 1 -ths_trip1_1_max = 2 -ths_trip1_2_min = 2 -ths_trip1_2_max = 3 -ths_trip1_3_min = 3 -ths_trip1_3_max = 4 -ths_trip1_4_min = 4 -ths_trip1_4_max = 4 -ths_trip1_5_min = 0 -ths_trip1_5_max = 0 -ths_trip1_6_min = 0 -ths_trip1_6_max = 0 -ths_trip2_count = 1 -ths_trip2_0 = 105 +ths_used = 1 +ths_trip1_count = 8 +ths_trip1_0 = 65 +ths_trip1_1 = 70 +ths_trip1_2 = 75 +ths_trip1_3 = 80 +ths_trip1_4 = 85 +ths_trip1_5 = 90 +ths_trip1_6 = 95 +ths_trip1_7 = 100 +ths_trip1_0_min = 0 +ths_trip1_0_max = 1 +ths_trip1_1_min = 1 +ths_trip1_1_max = 2 +ths_trip1_2_min = 2 +ths_trip1_2_max = 3 +ths_trip1_3_min = 3 +ths_trip1_3_max = 4 +ths_trip1_4_min = 4 +ths_trip1_4_max = 5 +ths_trip1_5_min = 5 +ths_trip1_5_max = 6 +ths_trip1_6_min = 6 +ths_trip1_6_max = 7 +ths_trip2_count = 1 +ths_trip2_0 = 105 + +;---------------------------------------------------------------------------------- +;cooler_table cooler_count <=32 +;---------------------------------------------------------------------------------- [cooler_table] -cooler_count = 5 +cooler_count = 8 cooler0 = "1200000 4 4294967295 0" -cooler1 = "1008000 4 4294967295 0" -cooler2 = "816000 4 4294967295 0" -cooler3 = "480000 4 4294967295 0" -cooler4 = "480000 1 4294967295 0" - +cooler1 = "912000 4 4294967295 0" +cooler2 = "768000 4 4294967295 0" +cooler3 = "648000 4 4294967295 0" +cooler4 = "480000 4 4294967295 0" +cooler5 = "480000 3 4294967295 0" +cooler6 = "240000 2 4294967295 0" +cooler7 = "240000 1 4294967295 0" [nand0_para] nand_support_2ch = 0 @@ -347,7 +347,6 @@ tv_dac_src0 = 0 [pwm0_para] pwm_used = 0 pwm_positive = port:PA05<3><0> -; If set gamc_phy to use = 2 [gmac0] gmac_used = 1 @@ -499,7 +498,7 @@ sdc_ddrmode = 1 [usbc0] usb_used = 1 usb_port_type = 2 -usb_detect_type = 1 +usb_detect_type = 0 usb_id_gpio = port:PG12<0><1> usb_det_vbus_gpio = port:PG12<0><1> usb_drv_vbus_gpio = port:PL02<1><0><0> @@ -560,7 +559,7 @@ luns = 3 serial_unique = 0 [module_para] -module_num = 7 +module_num = 4 module_power0 = "vcc-wifi-33" module_power0_vol = 0 module_power1 = @@ -575,8 +574,8 @@ lpo_use_apclk = [wifi_para] wifi_used = 1 wifi_sdc_id = 1 -wifi_usbc_id = 5 -wifi_usbc_type = 1 +wifi_usbc_id = +wifi_usbc_type = wl_reg_on = port:PL07<1><0> wl_host_wake = port:PG10<0><0> wl_host_wake_invert = 0 @@ -725,26 +724,24 @@ ls_used = 0 ;---------------------------------------------------------------------------------- [dvfs_table] pmuic_type = 1 -pmu_gpio0 = port:PL06<1><1><2><1> -pmu_level0 = 11300 -pmu_level1 = 1100 -;extremity_freq = 1200000000 +pmu_gpio0 = port:PL06<1><1><2><1> +pmu_level0 = 11300 +pmu_level1 = 1100 max_freq = 1200000000 -min_freq = 480000000 -boot_freq = 1200000000 -LV_count = 4 - +min_freq = 240000000 +LV_count = 6 LV1_freq = 1200000000 LV1_volt = 1300 - LV2_freq = 1008000000 LV2_volt = 1300 - -LV3_freq = 816000000 +LV3_freq = 912000000 LV3_volt = 1100 - -LV4_freq = 480000000 +LV4_freq = 648000000 LV4_volt = 1100 +LV5_freq = 480000000 +LV5_volt = 1100 +LV6_freq = 240000000 +LV6_volt = 1100 [gpu_dvfs_table] G_LV_count = 3 @@ -756,7 +753,7 @@ G_LV2_freq = 456000000 G_LV2_volt = 1200000 [board_vendor] -vid_used = 1 +vid_used = 0 vid_count = 2 vid_bit_0 = port:PC04<0><1> vid_bit_1 = port:PC07<0><1> @@ -837,3 +834,6 @@ mali_extreme_vol = 1400 [w1_para] w1_used = 1 gpio = 20 + +[corekeeper] +corekeeper_enabled = 1 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 52534b0c6..3838942f4 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 @@ -110,4 +110,25 @@ index 0000000..a62d565 +CONFIG_USB_EHCI_HCD=y +CONFIG_SYS_CLK_FREQ=480000000 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +diff --git a/configs/FriendlyARM_NanoPi_M1_Plus_defconfig b/configs/FriendlyARM_NanoPi_M1_Plus_defconfig +new file mode 100644 +index 0000000..5ba9f9e +--- /dev/null ++++ b/configs/FriendlyARM_NanoPi_M1_Plus_defconfig +@@ -0,0 +1,15 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN8I_H3=y ++CONFIG_DRAM_CLK=576 ++CONFIG_DRAM_ZQ=3881979 ++CONFIG_DRAM_ODT_EN=y ++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc" ++# 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_SUN8I_EMAC=y ++CONFIG_USB_EHCI_HCD=y ++CONFIG_MMC_SUNXI_SLOT_EXTRA=2 \ No newline at end of file diff --git a/patch/u-boot/u-boot-dev/add-missing-h3-boards.patch b/patch/u-boot/u-boot-dev/add-missing-h3-boards.patch index 8b068d472..32f8de62f 100644 --- a/patch/u-boot/u-boot-dev/add-missing-h3-boards.patch +++ b/patch/u-boot/u-boot-dev/add-missing-h3-boards.patch @@ -89,4 +89,25 @@ index 0000000..a62d565 +CONFIG_USB_EHCI_HCD=y +CONFIG_SYS_CLK_FREQ=480000000 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +diff --git a/configs/FriendlyARM_NanoPi_M1_Plus_defconfig b/configs/FriendlyARM_NanoPi_M1_Plus_defconfig +new file mode 100644 +index 0000000..5ba9f9e +--- /dev/null ++++ b/configs/FriendlyARM_NanoPi_M1_Plus_defconfig +@@ -0,0 +1,15 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN8I_H3=y ++CONFIG_DRAM_CLK=576 ++CONFIG_DRAM_ZQ=3881979 ++CONFIG_DRAM_ODT_EN=y ++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc" ++# 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_SUN8I_EMAC=y ++CONFIG_USB_EHCI_HCD=y ++CONFIG_MMC_SUNXI_SLOT_EXTRA=2 \ No newline at end of file