diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/Kconfig | 1 | ||||
-rw-r--r-- | common/blspec.c | 2 | ||||
-rw-r--r-- | common/boot.c | 4 | ||||
-rw-r--r-- | common/bootargs.c | 6 | ||||
-rw-r--r-- | common/bootchooser.c | 30 | ||||
-rw-r--r-- | common/bootm.c | 22 | ||||
-rw-r--r-- | common/console.c | 4 | ||||
-rw-r--r-- | common/fastboot.c | 11 | ||||
-rw-r--r-- | common/globalvar.c | 9 | ||||
-rw-r--r-- | common/imd-barebox.c | 1 | ||||
-rw-r--r-- | common/imd.c | 3 | ||||
-rw-r--r-- | common/machine_id.c | 2 | ||||
-rw-r--r-- | common/memsize.c | 2 | ||||
-rw-r--r-- | common/misc.c | 4 | ||||
-rw-r--r-- | common/password.c | 4 | ||||
-rw-r--r-- | common/startup.c | 15 | ||||
-rw-r--r-- | common/usbgadget.c | 15 | ||||
-rw-r--r-- | common/version.c | 6 |
18 files changed, 71 insertions, 70 deletions
diff --git a/common/Kconfig b/common/Kconfig index be03c0d5df..8c9fe8e788 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1373,6 +1373,7 @@ config PBL_BREAK on early pbl init. This option should be used only with JTAG debugger! source "lib/Kconfig.ubsan" +source "lib/kasan/Kconfig" config ASAN bool "ASAN: runtime memory debugger" diff --git a/common/blspec.c b/common/blspec.c index 9499d32477..a07343f427 100644 --- a/common/blspec.c +++ b/common/blspec.c @@ -766,7 +766,7 @@ int blspec_scan_devices(struct bootentries *bootentries) device_detect(dev); for_each_block_device(bdev) { - struct cdev *cdev = &bdev->cdev; + struct cdev *cdev; list_for_each_entry(cdev, &bdev->dev->cdevs, devices_list) { ret = blspec_scan_cdev(bootentries, cdev); diff --git a/common/boot.c b/common/boot.c index f546fce62c..90d504e3c3 100644 --- a/common/boot.c +++ b/common/boot.c @@ -136,7 +136,7 @@ static int init_boot(void) } late_initcall(init_boot); -BAREBOX_MAGICVAR_NAMED(global_watchdog_timeout, global.boot.watchdog_timeout, +BAREBOX_MAGICVAR(global.boot.watchdog_timeout, "Watchdog enable timeout in seconds before booting"); int boot_entry(struct bootentry *be, int verbose, int dryrun) @@ -361,4 +361,4 @@ void bootsources_list(struct bootentries *bootentries) printf("%-20s %s\n", entry->title, entry->description); } -BAREBOX_MAGICVAR_NAMED(global_boot_default, global.boot.default, "default boot order"); +BAREBOX_MAGICVAR(global.boot.default, "default boot order"); diff --git a/common/bootargs.c b/common/bootargs.c index 97d0e15eaf..fc345560ec 100644 --- a/common/bootargs.c +++ b/common/bootargs.c @@ -84,6 +84,6 @@ int linux_bootargs_overwrite(const char *bootargs) return 0; } -BAREBOX_MAGICVAR_NAMED(global_linux_bootargs_, global.linux.bootargs.*, "Linux bootargs variables"); -BAREBOX_MAGICVAR_NAMED(global_linux_mtdparts_, global.linux.mtdparts.*, "Linux mtdparts variables"); -BAREBOX_MAGICVAR_NAMED(global_linux_blkdevparts_, global.linux.blkdevparts.*, "Linux blkdevparts variables"); +BAREBOX_MAGICVAR(global.linux.bootargs.*, "Linux bootargs variables"); +BAREBOX_MAGICVAR(global.linux.mtdparts.*, "Linux mtdparts variables"); +BAREBOX_MAGICVAR(global.linux.blkdevparts.*, "Linux blkdevparts variables"); diff --git a/common/bootchooser.c b/common/bootchooser.c index c08db03eba..7aa59d8a82 100644 --- a/common/bootchooser.c +++ b/common/bootchooser.c @@ -954,21 +954,15 @@ static int bootchooser_init(void) } device_initcall(bootchooser_init); -BAREBOX_MAGICVAR_NAMED(global_bootchooser_disable_on_zero_attempts, - global.bootchooser.disable_on_zero_attempts, - "bootchooser: Disable target when remaining attempts counter reaches 0"); -BAREBOX_MAGICVAR_NAMED(global_bootchooser_retry, - global.bootchooser.retry, - "bootchooser: Try again when booting a target fails"); -BAREBOX_MAGICVAR_NAMED(global_bootchooser_targets, - global.bootchooser.targets, - "bootchooser: Space separated list of target names"); -BAREBOX_MAGICVAR_NAMED(global_bootchooser_default_attempts, - global.bootchooser.default_attempts, - "bootchooser: Default number of attempts for a target"); -BAREBOX_MAGICVAR_NAMED(global_bootchooser_default_priority, - global.bootchooser.default_priority, - "bootchooser: Default priority for a target"); -BAREBOX_MAGICVAR_NAMED(global_bootchooser_state_prefix, - global.bootchooser.state_prefix, - "bootchooser: state name prefix, empty for nv backend"); +BAREBOX_MAGICVAR(global.bootchooser.disable_on_zero_attempts, + "bootchooser: Disable target when remaining attempts counter reaches 0"); +BAREBOX_MAGICVAR(global.bootchooser.retry, + "bootchooser: Try again when booting a target fails"); +BAREBOX_MAGICVAR(global.bootchooser.targets, + "bootchooser: Space separated list of target names"); +BAREBOX_MAGICVAR(global.bootchooser.default_attempts, + "bootchooser: Default number of attempts for a target"); +BAREBOX_MAGICVAR(global.bootchooser.default_priority, + "bootchooser: Default priority for a target"); +BAREBOX_MAGICVAR(global.bootchooser.state_prefix, + "bootchooser: state name prefix, empty for nv backend"); diff --git a/common/bootm.c b/common/bootm.c index 60b8bf10a8..8219183b8b 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -847,14 +847,14 @@ static int bootm_init(void) late_initcall(bootm_init); BAREBOX_MAGICVAR(bootargs, "Linux kernel parameters"); -BAREBOX_MAGICVAR_NAMED(global_bootm_image, global.bootm.image, "bootm default boot image"); -BAREBOX_MAGICVAR_NAMED(global_bootm_image_loadaddr, global.bootm.image.loadaddr, "bootm default boot image loadaddr"); -BAREBOX_MAGICVAR_NAMED(global_bootm_initrd, global.bootm.initrd, "bootm default initrd"); -BAREBOX_MAGICVAR_NAMED(global_bootm_initrd_loadaddr, global.bootm.initrd.loadaddr, "bootm default initrd loadaddr"); -BAREBOX_MAGICVAR_NAMED(global_bootm_oftree, global.bootm.oftree, "bootm default oftree"); -BAREBOX_MAGICVAR_NAMED(global_bootm_tee, global.bootm.tee, "bootm default tee image"); -BAREBOX_MAGICVAR_NAMED(global_bootm_verify, global.bootm.verify, "bootm default verify level"); -BAREBOX_MAGICVAR_NAMED(global_bootm_verbose, global.bootm.verbose, "bootm default verbosity level (0=quiet)"); -BAREBOX_MAGICVAR_NAMED(global_bootm_appendroot, global.bootm.appendroot, "Add root= option to Kernel to mount rootfs from the device the Kernel comes from (default, device can be overridden via global.bootm.root_dev)"); -BAREBOX_MAGICVAR_NAMED(global_bootm_root_dev, global.bootm.root_dev, "bootm default root device (overrides default device in global.bootm.appendroot)"); -BAREBOX_MAGICVAR_NAMED(global_bootm_provide_machine_id, global.bootm.provide_machine_id, "If true, add systemd.machine_id= with value of global.machine_id to Kernel"); +BAREBOX_MAGICVAR(global.bootm.image, "bootm default boot image"); +BAREBOX_MAGICVAR(global.bootm.image.loadaddr, "bootm default boot image loadaddr"); +BAREBOX_MAGICVAR(global.bootm.initrd, "bootm default initrd"); +BAREBOX_MAGICVAR(global.bootm.initrd.loadaddr, "bootm default initrd loadaddr"); +BAREBOX_MAGICVAR(global.bootm.oftree, "bootm default oftree"); +BAREBOX_MAGICVAR(global.bootm.tee, "bootm default tee image"); +BAREBOX_MAGICVAR(global.bootm.verify, "bootm default verify level"); +BAREBOX_MAGICVAR(global.bootm.verbose, "bootm default verbosity level (0=quiet)"); +BAREBOX_MAGICVAR(global.bootm.appendroot, "Add root= option to Kernel to mount rootfs from the device the Kernel comes from (default, device can be overridden via global.bootm.root_dev)"); +BAREBOX_MAGICVAR(global.bootm.root_dev, "bootm default root device (overrides default device in global.bootm.appendroot)"); +BAREBOX_MAGICVAR(global.bootm.provide_machine_id, "If true, add systemd.machine_id= with value of global.machine_id to Kernel"); diff --git a/common/console.c b/common/console.c index 3375ecb7e5..ffb5c0f75f 100644 --- a/common/console.c +++ b/common/console.c @@ -628,8 +628,8 @@ void console_ctrlc_forbid(void) ctrlc_allowed = 0; } -BAREBOX_MAGICVAR_NAMED(global_console_ctrlc_allowed, global.console.ctrlc_allowed, +BAREBOX_MAGICVAR(global.console.ctrlc_allowed, "If true, scripts can be aborted with ctrl-c"); -BAREBOX_MAGICVAR_NAMED(global_linux_bootargs_console, global.linux.bootargs.console, +BAREBOX_MAGICVAR(global.linux.bootargs.console, "console= argument for Linux from the stdout-path property in /chosen node"); diff --git a/common/fastboot.c b/common/fastboot.c index bcfadfad3d..1b6dc28d8e 100644 --- a/common/fastboot.c +++ b/common/fastboot.c @@ -959,12 +959,9 @@ static int fastboot_globalvars_init(void) device_initcall(fastboot_globalvars_init); -BAREBOX_MAGICVAR_NAMED(global_fastboot_max_download_size, - global.fastboot.max_download_size, - "Fastboot maximum download size"); -BAREBOX_MAGICVAR_NAMED(global_fastboot_partitions, - global.fastboot.partitions, +BAREBOX_MAGICVAR(global.fastboot.max_download_size, + "Fastboot maximum download size"); +BAREBOX_MAGICVAR(global.fastboot.partitions, "Partitions exported for update via fastboot"); -BAREBOX_MAGICVAR_NAMED(global_fastboot_bbu, - global.fastboot.bbu, +BAREBOX_MAGICVAR(global.fastboot.bbu, "Export barebox update handlers via fastboot"); diff --git a/common/globalvar.c b/common/globalvar.c index 5bde86aad0..60793d7a30 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -652,11 +652,16 @@ static int globalvar_init(void) globalvar_add_simple("version", UTS_RELEASE); + if (strlen(buildsystem_version_string) > 0) + globalvar_add_simple("buildsystem.version", buildsystem_version_string); + return 0; } pure_initcall(globalvar_init); -BAREBOX_MAGICVAR_NAMED(global_version, global.version, "The barebox version"); +BAREBOX_MAGICVAR(global.version, "The barebox version"); +BAREBOX_MAGICVAR(global.buildsystem.version, + "version of buildsystem barebox was built with"); /** * nvvar_save - save NV variables to persistent environment @@ -668,7 +673,7 @@ int nvvar_save(void) { struct param_d *param; const char *env = default_environment_path_get(); - int ret; + int ret = 0; #define TMPDIR "/.env.tmp" if (!nv_dirty || !env) return 0; diff --git a/common/imd-barebox.c b/common/imd-barebox.c index e5cdfd1aed..06731d0600 100644 --- a/common/imd-barebox.c +++ b/common/imd-barebox.c @@ -23,4 +23,5 @@ __BAREBOX_IMD_SECTION(.barebox_imd_end) = { BAREBOX_IMD_TAG_STRING(imd_build_tag, IMD_TYPE_BUILD, UTS_VERSION, 1); BAREBOX_IMD_TAG_STRING(imd_release_tag, IMD_TYPE_RELEASE, UTS_RELEASE, 1); +BAREBOX_IMD_TAG_STRING(imd_buildsystem_version_tag, IMD_TYPE_BUILDSYSTEM, BUILDSYSTEM_VERSION, 1); BAREBOX_IMD_CRC(imd_crc32, 0x0, 1); diff --git a/common/imd.c b/common/imd.c index 0644e6d3bf..4fd4431aa9 100644 --- a/common/imd.c +++ b/common/imd.c @@ -168,6 +168,9 @@ static struct imd_type_names imd_types[] = { }, { .type = IMD_TYPE_CRC32, .name = "crc32", + }, { + .type = IMD_TYPE_BUILDSYSTEM, + .name = "buildsystem version", }, }; diff --git a/common/machine_id.c b/common/machine_id.c index e678bb7fe8..c1309ccafd 100644 --- a/common/machine_id.c +++ b/common/machine_id.c @@ -66,4 +66,4 @@ out: } late_initcall(machine_id_set_bootarg); -BAREBOX_MAGICVAR_NAMED(global_machine_id, global.machine_id, "Persistent device-specific, hexadecimal, 32-character id"); +BAREBOX_MAGICVAR(global.machine_id, "Persistent device-specific, hexadecimal, 32-character id"); diff --git a/common/memsize.c b/common/memsize.c index 915ab87b34..2fd2b71457 100644 --- a/common/memsize.c +++ b/common/memsize.c @@ -58,7 +58,7 @@ long get_ram_size(volatile long *base, long maxsize) *addr = 0; sync (); - if ((val = *addr) != 0) { + if (*addr != 0) { /* Restore the original data before leaving the function. */ sync (); diff --git a/common/misc.c b/common/misc.c index 1a1cc071b4..323500dfa8 100644 --- a/common/misc.c +++ b/common/misc.c @@ -155,7 +155,7 @@ const char *barebox_get_model(void) } EXPORT_SYMBOL(barebox_get_model); -BAREBOX_MAGICVAR_NAMED(global_model, global.model, "Product name of this hardware"); +BAREBOX_MAGICVAR(global.model, "Product name of this hardware"); static char *hostname; @@ -185,7 +185,7 @@ void barebox_set_hostname_no_overwrite(const char *__hostname) } EXPORT_SYMBOL(barebox_set_hostname_no_overwrite); -BAREBOX_MAGICVAR_NAMED(global_hostname, global.hostname, +BAREBOX_MAGICVAR(global.hostname, "shortname of the board. Also used as hostname for DHCP requests"); void __noreturn panic(const char *fmt, ...) diff --git a/common/password.c b/common/password.c index 3c08ab782e..a119717400 100644 --- a/common/password.c +++ b/common/password.c @@ -449,7 +449,7 @@ static int login_global_init(void) } late_initcall(login_global_init); -BAREBOX_MAGICVAR_NAMED(global_login_fail_command, global.login.fail_command, +BAREBOX_MAGICVAR(global.login.fail_command, "command to run when password entry failed"); -BAREBOX_MAGICVAR_NAMED(global_login_timeout, global.login.timeout, +BAREBOX_MAGICVAR(global.login.timeout, "timeout to type the password"); diff --git a/common/startup.c b/common/startup.c index 60d1102edf..d9d79aef89 100644 --- a/common/startup.c +++ b/common/startup.c @@ -440,12 +440,9 @@ void shutdown_barebox(void) console_flush(); } -BAREBOX_MAGICVAR_NAMED(autoboot_state, - global.autoboot, - "Autoboot state. Possible values: countdown (default), abort, menu, boot"); -BAREBOX_MAGICVAR_NAMED(global_autoboot_abort_key, - global.autoboot_abort_key, - "Which key allows to interrupt autoboot. Possible values: any, ctrl-c"); -BAREBOX_MAGICVAR_NAMED(global_autoboot_timeout, - global.autoboot_timeout, - "Timeout before autoboot starts in seconds"); +BAREBOX_MAGICVAR(global.autoboot, + "Autoboot state. Possible values: countdown (default), abort, menu, boot"); +BAREBOX_MAGICVAR(global.autoboot_abort_key, + "Which key allows to interrupt autoboot. Possible values: any, ctrl-c"); +BAREBOX_MAGICVAR(global.autoboot_timeout, + "Timeout before autoboot starts in seconds"); diff --git a/common/usbgadget.c b/common/usbgadget.c index b4f4ba04ca..51ee9c106c 100644 --- a/common/usbgadget.c +++ b/common/usbgadget.c @@ -124,12 +124,9 @@ static int usbgadget_globalvars_init(void) } device_initcall(usbgadget_globalvars_init); -BAREBOX_MAGICVAR_NAMED(global_usbgadget_autostart, - global.usbgadget.autostart, - "usbgadget: Automatically start usbgadget on boot"); -BAREBOX_MAGICVAR_NAMED(global_usbgadget_acm, - global.usbgadget.acm, - "usbgadget: Create CDC ACM function"); -BAREBOX_MAGICVAR_NAMED(global_usbgadget_dfu_function, - global.usbgadget.dfu_function, - "usbgadget: Create DFU function"); +BAREBOX_MAGICVAR(global.usbgadget.autostart, + "usbgadget: Automatically start usbgadget on boot"); +BAREBOX_MAGICVAR(global.usbgadget.acm, + "usbgadget: Create CDC ACM function"); +BAREBOX_MAGICVAR(global.usbgadget.dfu_function, + "usbgadget: Create DFU function"); diff --git a/common/version.c b/common/version.c index 8b1fd4dbe7..54cec5335d 100644 --- a/common/version.c +++ b/common/version.c @@ -10,11 +10,17 @@ const char release_string[] = "barebox-" UTS_RELEASE; EXPORT_SYMBOL(release_string); +const char buildsystem_version_string[] = + BUILDSYSTEM_VERSION; +EXPORT_SYMBOL(buildsystem_version_string); + #ifdef CONFIG_BANNER void barebox_banner (void) { printf("\n\n"); pr_info("%s", version_string); + if (strlen(buildsystem_version_string) > 0) + pr_info("Buildsystem version: %s", buildsystem_version_string); printf("\n\n"); pr_info("Board: %s\n", barebox_get_model()); } |