Skip to content

Commit 2eff272

Browse files
tiopexApaczer
andauthored
defconfig: btrfs, sound and usb drivers as a module (#93)
* defconfig: btrfs and usb drivers as a module * remove step for gather .ko files, * Remove volume dep from keyboard driver * miyoo_kbd: rm unused func and headers * add MIYOO_INCREASE/DECREASE_VOLUME() comments as ref. --------- Co-authored-by: Apaczer <94932128+Apaczer@users.noreply.github.com>
1 parent f31e12c commit 2eff272

3 files changed

Lines changed: 42 additions & 47 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,10 @@ jobs:
5353
mkdir dist
5454
mv arch/arm/boot/dts/*.dtb dist/
5555
mv arch/arm/boot/zImage dist/
56-
mv drivers/video/fbdev/core/*.ko dist/
57-
mv drivers/video/fbdev/*.ko dist/
58-
mv drivers/usb/gadget/legacy/*.ko dist/
59-
mv sound/drivers/*.ko dist/
6056
mv linux-5.15.141-miyoo-arm.tar dist/
6157
6258
- run: find ${{ inputs.submodule || '.' }}/dist
63-
59+
6460
- uses: actions/upload-artifact@v4
6561
with:
6662
name: kernel (uClibc)

arch/arm/configs/miyoo_defconfig

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ CONFIG_DEFAULT_HOSTNAME="miyoo"
44
CONFIG_LOG_BUF_SHIFT=16
55
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
66
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
7+
# CONFIG_BUG is not set
78
# CONFIG_KALLSYMS is not set
89
CONFIG_EMBEDDED=y
9-
CONFIG_PERF_EVENTS=y
1010
CONFIG_SLOB=y
1111
# CONFIG_ARCH_MULTI_V7 is not set
1212
CONFIG_ARCH_SUNXI_V5=y
@@ -37,8 +37,6 @@ CONFIG_INET=y
3737
# CONFIG_ETHTOOL_NETLINK is not set
3838
CONFIG_DEVTMPFS=y
3939
CONFIG_DEVTMPFS_MOUNT=y
40-
CONFIG_SUNXI_RSB=y
41-
CONFIG_MTD=y
4240
CONFIG_BLK_DEV_LOOP=y
4341
CONFIG_NETDEVICES=y
4442
# CONFIG_ETHERNET is not set
@@ -51,19 +49,24 @@ CONFIG_USB_NET_RNDIS_HOST=y
5149
# CONFIG_USB_BELKIN is not set
5250
# CONFIG_USB_NET_ZAURUS is not set
5351
# CONFIG_WLAN is not set
54-
CONFIG_INPUT_MOUSEDEV=y
52+
CONFIG_INPUT_FF_MEMLESS=y
53+
CONFIG_INPUT_MOUSEDEV=m
5554
CONFIG_INPUT_MOUSEDEV_SCREEN_X=320
5655
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
57-
CONFIG_INPUT_JOYDEV=y
58-
CONFIG_INPUT_EVDEV=y
56+
CONFIG_INPUT_JOYDEV=m
57+
CONFIG_INPUT_EVDEV=m
58+
CONFIG_KEYBOARD_ATKBD=m
5959
CONFIG_KEYBOARD_MIYOO=y
60-
CONFIG_MOUSE_SYNAPTICS_USB=y
60+
CONFIG_MOUSE_PS2=m
61+
CONFIG_MOUSE_SYNAPTICS_USB=m
6162
CONFIG_INPUT_JOYSTICK=y
62-
CONFIG_JOYSTICK_ANALOG=y
63-
CONFIG_JOYSTICK_XPAD=y
63+
CONFIG_JOYSTICK_ANALOG=m
64+
CONFIG_JOYSTICK_XPAD=m
6465
CONFIG_JOYSTICK_XPAD_FF=y
6566
CONFIG_INPUT_MISC=y
66-
CONFIG_INPUT_UINPUT=y
67+
CONFIG_INPUT_UINPUT=m
68+
CONFIG_SERIO_LIBPS2=y
69+
CONFIG_GAMEPORT=y
6770
CONFIG_LEGACY_PTY_COUNT=4
6871
CONFIG_SERIAL_8250=y
6972
CONFIG_SERIAL_8250_CONSOLE=y
@@ -77,7 +80,6 @@ CONFIG_BATTERY_MIYOO=y
7780
# CONFIG_HWMON is not set
7881
CONFIG_WATCHDOG=y
7982
CONFIG_SUNXI_WATCHDOG=y
80-
CONFIG_MFD_AXP20X_RSB=y
8183
CONFIG_MFD_SYSCON=y
8284
CONFIG_REGULATOR=y
8385
CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -94,47 +96,53 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
9496
CONFIG_BACKLIGHT_PWM=y
9597
CONFIG_FRAMEBUFFER_CONSOLE=y
9698
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
97-
CONFIG_SOUND=y
98-
CONFIG_SND=y
99+
CONFIG_SOUND=m
100+
CONFIG_SND=m
99101
# CONFIG_SND_VERBOSE_PROCFS is not set
100102
CONFIG_SND_ALOOP=m
101103
# CONFIG_SND_ARM is not set
102-
CONFIG_SND_SOC=y
103-
CONFIG_SND_SUNIV_CODEC=y
104+
CONFIG_SND_SOC=m
105+
CONFIG_SND_SUNIV_CODEC=m
106+
CONFIG_USB=y
104107
CONFIG_USB_DYNAMIC_MINORS=y
105108
CONFIG_USB_OTG=y
106-
CONFIG_USB_MUSB_HDRC=y
107-
CONFIG_USB_MUSB_SUNXI=y
109+
CONFIG_USB_MUSB_HDRC=m
110+
CONFIG_USB_MUSB_SUNXI=m
108111
CONFIG_NOP_USB_XCEIV=y
109112
CONFIG_USB_GADGET=y
110113
CONFIG_USB_GADGET_VBUS_DRAW=500
111-
CONFIG_USB_CONFIGFS=y
114+
CONFIG_USB_CONFIGFS=m
115+
CONFIG_USB_CONFIGFS_ACM=y
112116
CONFIG_USB_CONFIGFS_NCM=y
113117
CONFIG_USB_CONFIGFS_ECM=y
114118
CONFIG_USB_CONFIGFS_ECM_SUBSET=y
115119
CONFIG_USB_CONFIGFS_RNDIS=y
120+
CONFIG_USB_CONFIGFS_F_FS=y
116121
CONFIG_USB_CONFIGFS_F_HID=y
117-
CONFIG_USB_FUNCTIONFS=m
118-
CONFIG_USB_G_SERIAL=m
119-
CONFIG_USB_G_HID=m
120122
CONFIG_MMC=y
121123
CONFIG_MMC_SUNXI=y
122124
CONFIG_STAGING=y
123125
# CONFIG_IOMMU_SUPPORT is not set
124126
CONFIG_PWM=y
125127
CONFIG_PWM_SUNIV=y
126-
CONFIG_PHY_SUN4I_USB=y
128+
CONFIG_PHY_SUN4I_USB=m
129+
CONFIG_NVMEM=y
127130
CONFIG_NVMEM_SUNXI_SID=y
128131
CONFIG_EXT4_FS=y
129-
CONFIG_BTRFS_FS=y
132+
CONFIG_BTRFS_FS=m
130133
CONFIG_VFAT_FS=y
131134
CONFIG_TMPFS=y
135+
CONFIG_CONFIGFS_FS=y
132136
CONFIG_NLS_CODEPAGE_437=y
133137
CONFIG_NLS_ISO8859_1=y
134138
CONFIG_KEYS=y
135139
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
140+
CONFIG_CRYPTO_XXHASH=y
141+
CONFIG_CRYPTO_BLAKE2B=y
142+
CONFIG_CRYPTO_SHA256=y
136143
CONFIG_CRYPTO_DRBG_MENU=y
137144
# CONFIG_CRYPTO_HW is not set
145+
CONFIG_LIBCRC32C=y
138146
CONFIG_XZ_DEC=y
139147
CONFIG_PRINTK_TIME=y
140148
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=4

drivers/input/keyboard/miyoo_kbd.c

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,17 @@
1414
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1515
*/
1616
#include <linux/fs.h>
17-
#include <linux/kobject.h>
1817
#include <linux/cdev.h>
1918
#include <linux/init.h>
2019
#include <linux/device.h>
2120
#include <linux/module.h>
22-
#include <linux/delay.h>
2321
#include <linux/timer.h>
2422
#include <linux/gpio.h>
2523
#include <linux/input.h>
2624
#include <linux/kernel.h>
27-
#include <linux/slab.h>
2825
#include <linux/backlight.h>
29-
#include <asm/irq.h>
3026
#include <asm/io.h>
31-
#include <asm/io.h>
32-
#include <asm/arch-suniv/cpu.h>
33-
#include <asm/arch-suniv/gpio.h>
3427
#include <linux/uaccess.h>
35-
#include <linux/unistd.h>
3628

3729
//Hotkeys
3830
#define KILL_HK "/bin/sh", "-c", "/bin/kill -9 $(/bin/ps -al | /bin/grep \"/mnt/\")"
@@ -235,8 +227,8 @@ static void scan_handler(struct timer_list *timer)
235227
static uint32_t pre=0;
236228
uint32_t scan=0, val=0, debounce=0;
237229
static uint32_t touchRead=0, touchReadPrev=0;
238-
extern void MIYOO_INCREASE_VOLUME(void);
239-
extern void MIYOO_DECREASE_VOLUME(void);
230+
//extern void MIYOO_INCREASE_VOLUME(void);
231+
//extern void MIYOO_DECREASE_VOLUME(void);
240232
static char * kill_argv[] = {KILL_HK, NULL};
241233
static char * kill_soft_argv[] = {KILL_SOFT_HK, NULL};
242234
static char * shutdown_argv[] = {SHUTDOWN_HK, NULL};
@@ -785,19 +777,19 @@ static void scan_handler(struct timer_list *timer)
785777
}
786778
}
787779
else if((val & MY_R) && (val & MY_UP)){
788-
if(!hotkey_down && !hotkey_custom) {
789-
MIYOO_INCREASE_VOLUME();
790-
hotkey_down = true;
791-
}
780+
if (!hotkey_down && !hotkey_custom) {
781+
//MIYOO_INCREASE_VOLUME();
782+
hotkey_down = true;
783+
}
792784
hotkey_actioned = true;
793785
if (hotkey_custom)
794786
hotkey = hotkey == 0 ? 5 : hotkey;
795787
}
796788
else if((val & MY_R) && (val & MY_DOWN)){
797-
if(!hotkey_down && !hotkey_custom) {
798-
MIYOO_DECREASE_VOLUME();
799-
hotkey_down = true;
800-
}
789+
if (!hotkey_down && !hotkey_custom) {
790+
//MIYOO_DECREASE_VOLUME();
791+
hotkey_down = true;
792+
}
801793
hotkey_actioned = true;
802794
if (hotkey_custom)
803795
hotkey = hotkey == 0 ? 6 : hotkey;
@@ -1113,7 +1105,6 @@ static void __exit kbd_exit(void)
11131105
{
11141106
input_unregister_device(mydev);
11151107
del_timer(&mytimer);
1116-
11171108
device_destroy(myclass, major);
11181109
cdev_del(&mycdev);
11191110
class_destroy(myclass);

0 commit comments

Comments
 (0)