Skip to content

Commit

Permalink
deprecate legacy branding
Browse files Browse the repository at this point in the history
  • Loading branch information
gtxaspec committed Feb 16, 2024
1 parent 58fa190 commit 196467a
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ $(VERSION_FILE):
@( localvers='$(shell $(TOPDIR)/tools/setlocalversion $(TOPDIR))' ; \
printf '#define PLAIN_VERSION "%s%s"\n' \
"$(U_BOOT_VERSION)" "$${localvers}" ; \
printf '#define U_BOOT_VERSION "OpenIPC U-Boot %s%s"\n' \
printf '#define U_BOOT_VERSION "Ingenic U-Boot %s%s"\n' \
"$(U_BOOT_VERSION)" "$${localvers}" ; \
) > $@.tmp
@( printf '#define CC_VERSION_STRING "%s"\n' \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Ingenic OpenIPC U-Boot
# Ingenic U-Boot

This repository hosts the unofficial, enhanced OpenIPC U-Boot tailored for the Ingenic Xburst T10-T31 SoCs. It comes packed with a range of features to enhance usability and functionality for these specific SoCs.
This repository hosts an enhanced U-Boot tailored for the Ingenic Xburst T10-T31 SoCs. It comes packed with a range of features to enhance usability and functionality for these specific SoCs.

---

## Features

- **Automatic Partition Recognition**: Seamless compatibility with OpenIPC or custom firmware, recognizing partitions automatically.
- **Automatic Partition Recognition**: Seamless compatibility with thingino, OpenIPC, or other custom firmware, recognizing partitions automatically.
- **DHCP Client**: DHCP functionality for automatic network configuration.
- **FAT-Write Capability**: Allows writing to FAT file systems, enhancing file management flexibility.
- **Filesystem Compatibility**: Supports ext2 and ext4 filesystems for broader storage options.
Expand Down
12 changes: 6 additions & 6 deletions common/cmd_sdstart.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ static unsigned char *LOAD_ADDR = NULL;

// Macro to generate kernel filenames based on SoC
#define SDSTART_KERNEL_FILENAMES(soc) \
"factory_" #soc "_0P3N1PC_kernel", \
"factory_" #soc "_ZMC6tiIDQN", \
NULL // sentinel value
"factory_" #soc "_kernel", \
"factory_" #soc "_ZMC6tiIDQN", \
"factory_ZMC6tiIDQN", \
NULL // sentinel value

// Kernel filenames based on SoC
#ifdef CONFIG_T10
Expand All @@ -48,7 +49,6 @@ static const char* kernel_filenames[] = { SDSTART_KERNEL_FILENAMES(t15) };
#elif defined(CONFIG_T20)
// Special case for T20 to match factory
static const char* kernel_filenames[] = {
"factory_t20_0P3N1PC_kernel",
"factory_ZMC6tiIDQN",
NULL
};
Expand Down Expand Up @@ -241,7 +241,7 @@ int sdstart(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) {
*/

// Detect the kernel's presence without fully loading it
printf("MMC: Checking for kernel image from MMC... \n");
printf("MMC: Checking for kernel image from MMC... \n");
int i;
int found_kernel = 0;
for (i = 0; kernel_filenames[i] != NULL; i++) {
Expand All @@ -264,7 +264,7 @@ int sdstart(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) {
return 0; // Return early if user interrupted
}

printf("MMC: Loading external kernel image... \n");
printf("MMC: Loading external kernel image... \n");

// Load and validate the kernel
int old_ctrlc = disable_ctrlc(0);
Expand Down
2 changes: 1 addition & 1 deletion common/spl/spl.c
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ void preloader_console_init(void)

gd->have_console = 1;

puts("\n\nOpenIPC U-Boot SPL " PLAIN_VERSION " (" U_BOOT_DATE " - " \
puts("\n\nIngenic U-Boot SPL " PLAIN_VERSION " (" U_BOOT_DATE " - " \
U_BOOT_TIME ")\n");
#ifdef CONFIG_SPL_DISPLAY_PRINT
spl_display_print();
Expand Down
4 changes: 2 additions & 2 deletions include/configs/isvp_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@
#define CONFIG_ENV_OFFSET (CONFIG_SYS_NAND_BLOCK_SIZE * 5)
#endif

#define CONFIG_U_BOOT_BUILD_NAME "openipc_flex"
#define CONFIG_U_BOOT_BUILD_NAME "ingenic_flex_" SOC_VAR
#define CONFIG_SFC_MIN_ALIGN 0x10000 /*0x1000->4K Erase, 0x8000->32K, 0x10000->64K*/

#undef CONFIG_SYS_PROMPT
#define CONFIG_SYS_PROMPT "OpenIPC# "
#define CONFIG_SYS_PROMPT "ingenic_" SOC_VAR "# "

#define CONFIG_AUTOBOOT_KEYED
#define CONFIG_AUTOBOOT_PROMPT "KEY: ###### Press Ctrl-C now to interrupt boot... loading in %ds ######\n"
Expand Down

0 comments on commit 196467a

Please sign in to comment.