mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Remove BPI-R2 image generation, now available upstream
This commit is contained in:
Ycarus (Yannick Chabanois)
parent
9ae587ca64
commit
a5813fe1e4
18 changed files with 0 additions and 1458 deletions
|
|
@ -1,64 +0,0 @@
|
|||
From 075db54b57761868cd63434b466fffe7ba7a564f Mon Sep 17 00:00:00 2001
|
||||
From: Cristian Ciobanu <cioby.service@gmail.com>
|
||||
Date: Thu, 9 Apr 2020 17:59:27 +0300
|
||||
Subject: [PATCH] defconfig: r2: Add additional U-boot options for mt7623n
|
||||
|
||||
---
|
||||
configs/mt7623n_bpir2_defconfig | 30 ++++++++++++++++++++++++++++--
|
||||
1 file changed, 28 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig
|
||||
index 07ddade76a..36a903cbe7 100644
|
||||
--- a/configs/mt7623n_bpir2_defconfig
|
||||
+++ b/configs/mt7623n_bpir2_defconfig
|
||||
@@ -3,7 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y
|
||||
CONFIG_ARCH_MEDIATEK=y
|
||||
CONFIG_SYS_TEXT_BASE=0x81e00000
|
||||
CONFIG_SYS_MALLOC_F_LEN=0x4000
|
||||
-CONFIG_ENV_SIZE=0x1000
|
||||
+CONFIG_ENV_SIZE=0x2000
|
||||
CONFIG_ENV_OFFSET=0x100000
|
||||
CONFIG_TARGET_MT7623=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
@@ -14,7 +14,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
||||
CONFIG_DEFAULT_FDT_FILE="mt7623n-bananapi-bpi-r2"
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
CONFIG_HUSH_PARSER=y
|
||||
-CONFIG_SYS_PROMPT="U-Boot> "
|
||||
+CONFIG_SYS_PROMPT="BPI-R2> "
|
||||
CONFIG_CMD_BOOTMENU=y
|
||||
# CONFIG_CMD_ELF is not set
|
||||
# CONFIG_CMD_XIMG is not set
|
||||
@@ -57,3 +57,29 @@ CONFIG_MTK_TIMER=y
|
||||
CONFIG_WDT_MTK=y
|
||||
CONFIG_LZMA=y
|
||||
# CONFIG_EFI_LOADER is not set
|
||||
+
|
||||
+CONFIG_LOCALVERSION_AUTO=n
|
||||
+CONFIG_USE_DEFAULT_ENV_FILE=y
|
||||
+CONFIG_DEFAULT_ENV_FILE="uEnv.txt"
|
||||
+CONFIG_CMD_BOOTZ=y
|
||||
+CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
+
|
||||
+#commands used in uenv.txt
|
||||
+CONFIG_CMD_ASKENV=y
|
||||
+CONFIG_CMD_STRINGS=y
|
||||
+CONFIG_CMD_SETEXPR=y
|
||||
+CONFIG_CMD_CACHE=y
|
||||
+CONFIG_CMD_ERASEENV=y
|
||||
+CONFIG_PCI=y
|
||||
+CONFIG_DM_PCI=y
|
||||
+CONFIG_PCIE_MEDIATEK=y
|
||||
+CONFIG_PHY=y
|
||||
+CONFIG_PHY_MTK_TPHY=y
|
||||
+CONFIG_CMD_PCI=y
|
||||
+CONFIG_AHCI=y
|
||||
+CONFIG_AHCI_PCI=y
|
||||
+CONFIG_SCSI=y
|
||||
+CONFIG_DM_SCSI=y
|
||||
+CONFIG_SCSI_AHCI=y
|
||||
+CONFIG_HAVE_BLOCK_DEVICE=y
|
||||
+CONFIG_POWER_MT6323=y
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
From 15e032f5b06ba97a7777bc32aef15e10d0086041 Mon Sep 17 00:00:00 2001
|
||||
From: Cristian Ciobanu <cioby.service@gmail.com>
|
||||
Date: Wed, 8 Apr 2020 22:27:01 +0300
|
||||
Subject: [PATCH] u-boot: Modify environment offset for mt7623
|
||||
|
||||
---
|
||||
include/configs/mt7623.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
|
||||
index faab0913fc..5d0da71ce9 100644
|
||||
--- a/include/configs/mt7623.h
|
||||
+++ b/include/configs/mt7623.h
|
||||
@@ -56,5 +56,6 @@
|
||||
#define CONFIG_SERVERIP 192.168.1.2
|
||||
|
||||
#define CONFIG_SYS_MMC_ENV_DEV 0
|
||||
+#define CONFIG_ENV_OFFSET 0xF3800
|
||||
|
||||
#endif
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,219 +0,0 @@
|
|||
From 798f0fc54926093a074a9cbb011de833a0614c3a Mon Sep 17 00:00:00 2001
|
||||
From: Frank Wunderlich <frank-w@public-files.de>
|
||||
Date: Fri, 28 Dec 2018 17:56:19 +0100
|
||||
Subject: [PATCH 1/2] bootmenu: added key-input (1-9,a-f)
|
||||
|
||||
---
|
||||
cmd/bootmenu.c | 145 ++++++++++++++++++++++++++++++++-----------------
|
||||
1 file changed, 94 insertions(+), 51 deletions(-)
|
||||
|
||||
diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
|
||||
index 3dc2c854ac..fd6ba6c8af 100644
|
||||
--- a/cmd/bootmenu.c
|
||||
+++ b/cmd/bootmenu.c
|
||||
@@ -40,7 +40,22 @@ struct bootmenu_data {
|
||||
|
||||
enum bootmenu_key {
|
||||
KEY_NONE = 0,
|
||||
- KEY_UP,
|
||||
+ KEY_1,
|
||||
+ KEY_2,
|
||||
+ KEY_3,
|
||||
+ KEY_4,
|
||||
+ KEY_5,
|
||||
+ KEY_6,
|
||||
+ KEY_7,
|
||||
+ KEY_8,
|
||||
+ KEY_9,
|
||||
+ KEY_a,
|
||||
+ KEY_b,
|
||||
+ KEY_c,
|
||||
+ KEY_d,
|
||||
+ KEY_e,
|
||||
+ KEY_f,
|
||||
+ KEY_UP = 20,
|
||||
KEY_DOWN,
|
||||
KEY_SELECT,
|
||||
};
|
||||
@@ -78,6 +93,23 @@ static void bootmenu_print_entry(void *data)
|
||||
puts(ANSI_COLOR_RESET);
|
||||
}
|
||||
|
||||
+bool get_bootmenu_key(enum bootmenu_key *key, int c)
|
||||
+{
|
||||
+ /* ANSI '1~9' - was pressed */
|
||||
+ if (c <= '9' && c >= '1' )
|
||||
+ {
|
||||
+ *key = c-48;
|
||||
+ return true;
|
||||
+ }else
|
||||
+ /* ANSI 'a~f' - was pressed */
|
||||
+ if (c <= 'f' && c >= 'a' )
|
||||
+ {
|
||||
+ *key = c-87;
|
||||
+ return true;
|
||||
+ }
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
static void bootmenu_autoboot_loop(struct bootmenu_data *menu,
|
||||
enum bootmenu_key *key, int *esc)
|
||||
{
|
||||
@@ -98,23 +130,23 @@ static void bootmenu_autoboot_loop(struct bootmenu_data *menu,
|
||||
|
||||
menu->delay = -1;
|
||||
c = getc();
|
||||
-
|
||||
- switch (c) {
|
||||
- case '\e':
|
||||
- *esc = 1;
|
||||
- *key = KEY_NONE;
|
||||
- break;
|
||||
- case '\r':
|
||||
- *key = KEY_SELECT;
|
||||
- break;
|
||||
- default:
|
||||
- *key = KEY_NONE;
|
||||
- break;
|
||||
+ if (!get_bootmenu_key(key,c))
|
||||
+ {
|
||||
+ switch (c) {
|
||||
+ case '\e':
|
||||
+ *esc = 1;
|
||||
+ *key = KEY_NONE;
|
||||
+ break;
|
||||
+ case '\r':
|
||||
+ *key = KEY_SELECT;
|
||||
+ break;
|
||||
+ default:
|
||||
+ *key = KEY_NONE;
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
-
|
||||
break;
|
||||
}
|
||||
-
|
||||
if (menu->delay < 0)
|
||||
break;
|
||||
|
||||
@@ -141,47 +173,49 @@ static void bootmenu_loop(struct bootmenu_data *menu,
|
||||
|
||||
c = getc();
|
||||
|
||||
- switch (*esc) {
|
||||
- case 0:
|
||||
- /* First char of ANSI escape sequence '\e' */
|
||||
- if (c == '\e') {
|
||||
- *esc = 1;
|
||||
- *key = KEY_NONE;
|
||||
- }
|
||||
- break;
|
||||
- case 1:
|
||||
- /* Second char of ANSI '[' */
|
||||
- if (c == '[') {
|
||||
- *esc = 2;
|
||||
- *key = KEY_NONE;
|
||||
- } else {
|
||||
- *esc = 0;
|
||||
- }
|
||||
- break;
|
||||
- case 2:
|
||||
- case 3:
|
||||
- /* Third char of ANSI (number '1') - optional */
|
||||
- if (*esc == 2 && c == '1') {
|
||||
- *esc = 3;
|
||||
+ if (!get_bootmenu_key(key,c))
|
||||
+ {
|
||||
+ switch (*esc) {
|
||||
+ case 0:
|
||||
+ /* First char of ANSI escape sequence '\e' */
|
||||
+ if (c == '\e') {
|
||||
+ *esc = 1;
|
||||
+ *key = KEY_NONE;
|
||||
+ }
|
||||
+ break;
|
||||
+ case 1:
|
||||
+ /* Second char of ANSI '[' */
|
||||
+ if (c == '[') {
|
||||
+ *esc = 2;
|
||||
*key = KEY_NONE;
|
||||
+ } else {
|
||||
+ *esc = 0;
|
||||
+ }
|
||||
break;
|
||||
- }
|
||||
+ case 2:
|
||||
+ case 3:
|
||||
+ /* Third char of ANSI (number '1') - optional */
|
||||
+ if (*esc == 2 && c == '1') {
|
||||
+ *esc = 3;
|
||||
+ *key = KEY_NONE;
|
||||
+ break;
|
||||
+ }
|
||||
|
||||
- *esc = 0;
|
||||
+ *esc = 0;
|
||||
|
||||
- /* ANSI 'A' - key up was pressed */
|
||||
- if (c == 'A')
|
||||
- *key = KEY_UP;
|
||||
- /* ANSI 'B' - key down was pressed */
|
||||
- else if (c == 'B')
|
||||
- *key = KEY_DOWN;
|
||||
- /* other key was pressed */
|
||||
- else
|
||||
- *key = KEY_NONE;
|
||||
+ /* ANSI 'A' - key up was pressed */
|
||||
+ if (c == 'A')
|
||||
+ *key = KEY_UP;
|
||||
+ /* ANSI 'B' - key down was pressed */
|
||||
+ else if (c == 'B')
|
||||
+ *key = KEY_DOWN;
|
||||
+ /* other key was pressed */
|
||||
+ else
|
||||
+ *key = KEY_NONE;
|
||||
|
||||
- break;
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
-
|
||||
/* enter key was pressed */
|
||||
if (c == '\r')
|
||||
*key = KEY_SELECT;
|
||||
@@ -204,6 +238,14 @@ static char *bootmenu_choice_entry(void *data)
|
||||
bootmenu_loop(menu, &key, &esc);
|
||||
}
|
||||
|
||||
+ if (key < KEY_UP && key > KEY_NONE)
|
||||
+ {
|
||||
+ menu->active = key-1;
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+
|
||||
switch (key) {
|
||||
case KEY_UP:
|
||||
if (menu->active > 0)
|
||||
@@ -223,6 +265,7 @@ static char *bootmenu_choice_entry(void *data)
|
||||
default:
|
||||
break;
|
||||
}
|
||||
+ }
|
||||
}
|
||||
|
||||
/* never happens */
|
||||
@@ -467,7 +510,7 @@ void menu_display_statusline(struct menu *m)
|
||||
printf(ANSI_CURSOR_POSITION, menu->count + 5, 1);
|
||||
puts(ANSI_CLEAR_LINE);
|
||||
printf(ANSI_CURSOR_POSITION, menu->count + 6, 1);
|
||||
- puts(" Press UP/DOWN to move, ENTER to select");
|
||||
+ puts(" Press UP/DOWN to move or Press 1~9,a~f to choose, ENTER to select");
|
||||
puts(ANSI_CLEAR_LINE_TO_END);
|
||||
printf(ANSI_CURSOR_POSITION, menu->count + 7, 1);
|
||||
puts(ANSI_CLEAR_LINE);
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 39b0c824b56be1000844cedb5faba506b6b09b9b Mon Sep 17 00:00:00 2001
|
||||
From: Cristian Ciobanu <cioby.service@gmail.com>
|
||||
Date: Fri, 10 Apr 2020 00:41:42 +0300
|
||||
Subject: [PATCH] Add EXT4 support in U-boot
|
||||
|
||||
---
|
||||
configs/mt7623n_bpir2_defconfig | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig
|
||||
index 36a903cbe7..09b9b6f797 100644
|
||||
--- a/configs/mt7623n_bpir2_defconfig
|
||||
+++ b/configs/mt7623n_bpir2_defconfig
|
||||
@@ -83,3 +83,8 @@ CONFIG_DM_SCSI=y
|
||||
CONFIG_SCSI_AHCI=y
|
||||
CONFIG_HAVE_BLOCK_DEVICE=y
|
||||
CONFIG_POWER_MT6323=y
|
||||
+
|
||||
+CONFIG_CMD_EXT4=y
|
||||
+CONFIG_CMD_EXT4_WRITE=y
|
||||
+CONFIG_FS_EXT4=y
|
||||
+CONFIG_EXT4_WRITE=y
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue