Skip to content

Commit 041120f

Browse files
committed
Merge branch 'develop'
2 parents f6d4b3f + 59b33c3 commit 041120f

File tree

225 files changed

+19978
-451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+19978
-451
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
sudo rm -rf /var/lib/apt/lists/*
2525
sudo sed -i 's/# \(en_US.UTF-8\)/\1/' /etc/locale.gen
2626
sudo locale-gen --purge --lang en_US.UTF-8
27+
- name: Build SDK
28+
run: make sdk
2729
- name: Build FunKey-OS
2830
run: make
2931
- uses: actions/upload-artifact@v2

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "buildroot"]
22
path = buildroot
3-
url = git://git.buildroot.net/buildroot
3+
url = https://github.com/FunKey-Project/buildroot.git

FunKey/Config.in

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,11 @@ source "$BR2_EXTERNAL_FUNKEY_PATH/package/PocketSNES/Config.in"
99
source "$BR2_EXTERNAL_FUNKEY_PATH/package/gpsp/Config.in"
1010
source "$BR2_EXTERNAL_FUNKEY_PATH/package/dmtx-utils/Config.in"
1111
source "$BR2_EXTERNAL_FUNKEY_PATH/package/ProdScreens/Config.in"
12+
source "$BR2_EXTERNAL_FUNKEY_PATH/package/fonts-droid/Config.in"
13+
source "$BR2_EXTERNAL_FUNKEY_PATH/package/libini/Config.in"
14+
source "$BR2_EXTERNAL_FUNKEY_PATH/package/libopk/Config.in"
15+
source "$BR2_EXTERNAL_FUNKEY_PATH/package/libxdgmime/Config.in"
16+
source "$BR2_EXTERNAL_FUNKEY_PATH/package/gmenu2x/Config.in"
17+
source "$BR2_EXTERNAL_FUNKEY_PATH/package/agg/Config.in"
18+
source "$BR2_EXTERNAL_FUNKEY_PATH/package/fluidlite/Config.in"
19+
source "$BR2_EXTERNAL_FUNKEY_PATH/package/libmikmod/Config.in"

FunKey/board/funkey/busybox.config

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Busybox version: 1.31.1
4-
# Mon Nov 9 00:34:05 2020
3+
# Busybox version: 1.32.0
4+
# Fri Jan 15 10:58:20 2021
55
#
66
CONFIG_HAVE_DOT_CONFIG=y
77

@@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install"
7676
# CONFIG_DEBUG_SANITIZE is not set
7777
# CONFIG_UNIT_TEST is not set
7878
# CONFIG_WERROR is not set
79+
# CONFIG_WARN_SIMPLE_MSG is not set
7980
CONFIG_NO_DEBUG_LIB=y
8081
# CONFIG_DMALLOC is not set
8182
# CONFIG_EFENCE is not set
@@ -462,6 +463,7 @@ CONFIG_FEATURE_FIND_SIZE=y
462463
CONFIG_FEATURE_FIND_PRUNE=y
463464
CONFIG_FEATURE_FIND_QUIT=y
464465
# CONFIG_FEATURE_FIND_DELETE is not set
466+
CONFIG_FEATURE_FIND_EMPTY=y
465467
CONFIG_FEATURE_FIND_PATH=y
466468
CONFIG_FEATURE_FIND_REGEX=y
467469
# CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -692,6 +694,7 @@ CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES=y
692694
CONFIG_SWITCH_ROOT=y
693695
# CONFIG_TASKSET is not set
694696
# CONFIG_FEATURE_TASKSET_FANCY is not set
697+
# CONFIG_FEATURE_TASKSET_CPULIST is not set
695698
CONFIG_UEVENT=y
696699
CONFIG_UMOUNT=y
697700
CONFIG_FEATURE_UMOUNT_ALL=y
@@ -805,6 +808,7 @@ CONFIG_MAKEDEVS=y
805808
CONFIG_FEATURE_MAKEDEVS_TABLE=y
806809
# CONFIG_MAN is not set
807810
CONFIG_MICROCOM=y
811+
CONFIG_MIM=y
808812
CONFIG_MT=y
809813
# CONFIG_NANDWRITE is not set
810814
# CONFIG_NANDDUMP is not set
@@ -1095,6 +1099,7 @@ CONFIG_SH_IS_ASH=y
10951099
# CONFIG_BASH_IS_ASH is not set
10961100
# CONFIG_BASH_IS_HUSH is not set
10971101
CONFIG_BASH_IS_NONE=y
1102+
CONFIG_SHELL_ASH=y
10981103
CONFIG_ASH=y
10991104
CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
11001105
CONFIG_ASH_INTERNAL_GLOB=y
@@ -1115,6 +1120,7 @@ CONFIG_ASH_GETOPTS=y
11151120
CONFIG_ASH_CMDCMD=y
11161121
# CONFIG_CTTYHACK is not set
11171122
# CONFIG_HUSH is not set
1123+
# CONFIG_SHELL_HUSH is not set
11181124
# CONFIG_HUSH_BASH_COMPAT is not set
11191125
# CONFIG_HUSH_BRACE_EXPANSION is not set
11201126
# CONFIG_HUSH_LINENO_VAR is not set
@@ -1177,6 +1183,7 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y
11771183
CONFIG_FEATURE_REMOTE_LOG=y
11781184
# CONFIG_FEATURE_SYSLOGD_DUP is not set
11791185
# CONFIG_FEATURE_SYSLOGD_CFG is not set
1186+
# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
11801187
CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
11811188
# CONFIG_FEATURE_IPC_SYSLOG is not set
11821189
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0

FunKey/board/funkey/linux.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ CONFIG_CPU_FREQ=y
2525
CONFIG_CPUFREQ_DT=y
2626
CONFIG_VFP=y
2727
CONFIG_NEON=y
28+
CONFIG_KERNEL_MODE_NEON=y
2829
# CONFIG_COREDUMP is not set
2930
CONFIG_HIBERNATION=y
3031
CONFIG_PM_STD_PARTITION="/dev/mmcblk0p2"
@@ -152,7 +153,7 @@ CONFIG_AUTOFS4_FS=y
152153
CONFIG_VFAT_FS=y
153154
CONFIG_TMPFS=y
154155
CONFIG_CONFIGFS_FS=y
155-
# CONFIG_MISC_FILESYSTEMS is not set
156+
CONFIG_SQUASHFS=y
156157
# CONFIG_NETWORK_FILESYSTEMS is not set
157158
CONFIG_NLS_CODEPAGE_437=y
158159
CONFIG_NLS_ISO8859_1=y

0 commit comments

Comments
 (0)