Skip to content
Snippets Groups Projects
Commit 34e6e6e6 authored by Daniel Gachet's avatar Daniel Gachet
Browse files

wip

parent bf894dc3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
config/buildroot_nano.patch
+ 47
− 24
View file @ 34e6e6e6
board/friendlyarm/nanopi-neo-plus2/boot.cmd | 6 ++
board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 5 +-
.../nanopi-neo-plus2/linux-extras.config | 11 +++
.../nanopi-neo-plus2/nanopi-neo-plus2.dts | 7 ++
configs/friendlyarm_nanopi_neo_plus2_defconfig | 99 +++++++++++++---------
package/dropbear/S50dropbear | 2 +-
package/openssh/S50sshd | 3 +
7 files changed, 90 insertions(+), 43 deletions(-)
board/friendlyarm/nanopi-neo-plus2/boot.cmd | 6 ++
board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 5 +-
.../nanopi-neo-plus2/linux-extras.config | 10 ++
.../nanopi-neo-plus2/nanopi-neo-plus2.dts | 7 ++
boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +-
configs/friendlyarm_nanopi_neo_plus2_defconfig | 107 +++++++++++++--------
package/dropbear/S50dropbear | 2 +-
package/openssh/S50sshd | 3 +
8 files changed, 98 insertions(+), 44 deletions(-)
diff --git a/board/friendlyarm/nanopi-neo-plus2/boot.cmd b/board/friendlyarm/nanopi-neo-plus2/boot.cmd
new file mode 100644
......@@ -42,10 +43,10 @@ index fb871abd43..1f87767431 100644
}
}
diff --git a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config b/board/friendlyarm/nanopi-neo-plus2/linux-extras.config
index 52b4b4b29e..2ea8b06bc2 100644
index 52b4b4b29e..7a9e790638 100644
--- a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config
+++ b/board/friendlyarm/nanopi-neo-plus2/linux-extras.config
@@ -8,3 +8,14 @@ CONFIG_CFG80211_WEXT=y
@@ -8,3 +8,13 @@ CONFIG_CFG80211_WEXT=y
CONFIG_WLAN=y
CONFIG_WLAN_VENDOR_BROADCOM=y
CONFIG_BRCMFMAC=m
......@@ -59,10 +60,9 @@ index 52b4b4b29e..2ea8b06bc2 100644
+
+# MediaTek pinctrl drivers
+CONFIG_GPIO_SYSFS=y
+
diff --git a/board/friendlyarm/nanopi-neo-plus2/nanopi-neo-plus2.dts b/board/friendlyarm/nanopi-neo-plus2/nanopi-neo-plus2.dts
new file mode 100644
index 0000000000..f80383b0ff
index 0000000000..3e51c39042
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo-plus2/nanopi-neo-plus2.dts
@@ -0,0 +1,7 @@
......@@ -73,17 +73,33 @@ index 0000000000..f80383b0ff
+/ {
+ /delete-node/ leds;
+};
\ No newline at end of file
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
index 00b68a30af..12d82a037e 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -167,7 +167,7 @@ ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += \
define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
$(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
- $(ARM_TRUSTED_FIRMWARE_MAKE_ENV) $(MAKE) -C $(@D) \
+ $(ARM_TRUSTED_FIRMWARE_MAKE_ENV) CFLAGS=-fno-stack-protector $(MAKE) -C $(@D) \
$(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
$(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS)
$(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_BUILD)
diff --git a/configs/friendlyarm_nanopi_neo_plus2_defconfig b/configs/friendlyarm_nanopi_neo_plus2_defconfig
index 461e468cb6..730e02382a 100644
index 461e468cb6..5e4fcbcba4 100644
--- a/configs/friendlyarm_nanopi_neo_plus2_defconfig
+++ b/configs/friendlyarm_nanopi_neo_plus2_defconfig
@@ -1,24 +1,71 @@
@@ -1,62 +1,89 @@
BR2_aarch64=y
-BR2_cortex_a53=y
BR2_ARM_FPU_VFPV4=y
-
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_PACKAGE_HOST_GDB=y
+BR2_GDB_VERSION_10=y
+BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO Plus2"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
BR2_ROOTFS_OVERLAY="board/friendlyarm/nanopi-neo-plus2/rootfs_overlay"
......@@ -98,23 +114,27 @@ index 461e468cb6..730e02382a 100644
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo-plus2/linux-extras.config"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo-plus2"
+BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/friendlyarm/nanopi-neo-plus2/nanopi-neo-plus2.dts"
+BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_LINUX_TOOLS_PERF=y
+BR2_PACKAGE_LINUX_TOOLS_PERF_TUI=y
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_GDB=y
+BR2_PACKAGE_GDB_SERVER=y
+BR2_PACKAGE_GDB_DEBUGGER=y
+BR2_PACKAGE_LTRACE=y
+BR2_PACKAGE_GDB_TUI=y
+BR2_PACKAGE_LSOF=y
+BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_TRACE_CMD=y
+BR2_PACKAGE_VALGRIND=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_MICROPYTHON=y
+BR2_PACKAGE_MICROPYTHON_LIB=y
+BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y
+BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
+BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y
+BR2_PACKAGE_MYSQL=y
+BR2_PACKAGE_SQLITE=y
+BR2_PACKAGE_SQLITE_STAT4=y
+BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA=y
......@@ -122,9 +142,9 @@ index 461e468cb6..730e02382a 100644
+BR2_PACKAGE_SQLITE_ENABLE_JSON1=y
+BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY=y
+BR2_PACKAGE_SQLITE_SECURE_DELETE=y
+BR2_PACKAGE_SQLITE_NO_SYNC=y
+BR2_PACKAGE_EXPAT=y
+BR2_PACKAGE_JSON_C=y
+BR2_PACKAGE_JSONCPP=y
+BR2_PACKAGE_LIBYAML=y
+BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_IPTABLES=y
......@@ -132,7 +152,6 @@ index 461e468cb6..730e02382a 100644
+BR2_PACKAGE_IPTABLES_NFTABLES=y
+BR2_PACKAGE_IPUTILS=y
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
......@@ -151,6 +170,7 @@ index 461e468cb6..730e02382a 100644
-
-# Bootloader
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+# BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
......@@ -158,8 +178,10 @@ index 461e468cb6..730e02382a 100644
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo_plus2"
BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
@@ -27,36 +74,8 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
......@@ -178,8 +200,6 @@ index 461e468cb6..730e02382a 100644
-BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO Plus2"
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo-plus2/boot.cmd"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
......@@ -198,6 +218,9 @@ index 461e468cb6..730e02382a 100644
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo-plus2/boot.cmd"
diff --git a/package/dropbear/S50dropbear b/package/dropbear/S50dropbear
index 9474eaafaa..bb8e75850e 100644
--- a/package/dropbear/S50dropbear
......
install-fedora-environment.sh
+ 3
− 3
View file @ 34e6e6e6
......@@ -19,14 +19,14 @@ sudo dnf install -y minicom
sudo chmod +s /usr/bin/minicom
#install some fedora tools
sudo dnf install -y gnome-tweak-tool firewall-config kernel-devel libyaml-devel
sudo dnf install -y gnome-tweak-tool firewall-config kernel-devel libyaml-devel perl
sudo dnf install -y gcc-c++ autoconf libtool dtc make patch ctags openssl-devel uboot-tools ncurses-devel mercurial
sudo dnf install -y flex bison swig python-devel python3-devel policycoreutils-python-utils perl-ExtUtils-MakeMaker
## make additional symbolic links for former libraries used by aarch64 gdb
## probably to be removed with newest buildroot version
sudo ln -s /usr/lib64/libtinfo.so.6.1 /usr/lib64/libtinfo.so.5
sudo ln -s /usr/lib64/libncursesw.so.6.1 /usr/lib64/libncursesw.so.5
##sudo ln -s /usr/lib64/libtinfo.so.6.1 /usr/lib64/libtinfo.so.5
##sudo ln -s /usr/lib64/libncursesw.so.6.1 /usr/lib64/libncursesw.so.5
#install git tools and configure keyring
sudo dnf install -y git-gui meld
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment