[cmdline] Rename "console" command's --bpp option to --depth

Rename the "--bpp" option to "--depth", to free up the single-letter
option "-b" for "--bottom" in preparation for adding margin support.

This does not break backwards compatibility with documented features,
since the "console" command has not yet been documented.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/i386/interface/pcbios/vesafb.c b/src/arch/i386/interface/pcbios/vesafb.c
index d4a7287a807337c7b0400616c865d8bf1dd79eca..2adc7b04029e0e286217a6031f5e9f572d5c1f93 100644 (file)
--- a/src/arch/i386/interface/pcbios/vesafb.c
+++ b/src/arch/i386/interface/pcbios/vesafb.c
@@ -419,7 +419,7 @@ static int vesafb_init ( struct console_configuration *config ) {
        /* Select mode */
        if ( ( mode_number = vesafb_select_mode ( mode_numbers, config->width,
                                                  config->height,
-                                                 config->bpp ) ) < 0 ) {
+                                                 config->depth ) ) < 0 ) {
                rc = mode_number;
                goto err_select_mode;
        }

diff --git a/src/hci/commands/console_cmd.c b/src/hci/commands/console_cmd.c
index 9bea27903b0e553ef01edb6e8368e710fb332c81..a82fa38fe22c499b447b498c40e14f273d48dec7 100644 (file)
--- a/src/hci/commands/console_cmd.c
+++ b/src/hci/commands/console_cmd.c
@@ -51,8 +51,8 @@ static struct option_descriptor console_opts[] = {
                      struct console_options, config.width, parse_integer ),
        OPTION_DESC ( "y", 'y', required_argument,
                      struct console_options, config.height, parse_integer ),
-       OPTION_DESC ( "bpp", 'b', required_argument,
-                     struct console_options, config.bpp, parse_integer ),
+       OPTION_DESC ( "depth", 'd', required_argument,
+                     struct console_options, config.depth, parse_integer ),
        OPTION_DESC ( "picture", 'p', required_argument,
                      struct console_options, picture, parse_string ),
        OPTION_DESC ( "keep", 'k', no_argument,

diff --git a/src/include/ipxe/console.h b/src/include/ipxe/console.h
index 6696a5b8d098885f9ec2cdd51fd80721adb73a08..4b90c9cec43a0ff0015c85b10df33c361ae30991 100644 (file)
--- a/src/include/ipxe/console.h
+++ b/src/include/ipxe/console.h
@@ -27,7 +27,7 @@ struct console_configuration {
        /** Height */
        unsigned int height;
        /** Colour depth */
-       unsigned int bpp;
+       unsigned int depth;
        /** Left margin */
        unsigned int left;
        /** Right margin */