diff options
author | Hung-Te Lin <hungte@chromium.org> | 2012-08-18 14:32:25 +0800 |
---|---|---|
committer | Gerrit <chrome-bot@google.com> | 2012-08-20 10:13:00 -0700 |
commit | 1550b14604cccd8a4faa70958d98823d70bbf750 (patch) | |
tree | 1bec3152ffa32ec4a98ad58a9fba9951fb008423 | |
parent | 7ce91cd2f93eac4022f075ba13fec5b3a6cdde33 (diff) | |
download | vboot-1550b14604cccd8a4faa70958d98823d70bbf750.tar.gz |
newbitmaps: Support more profiles.
Added "n1366usb2" profile and remove SD icon in *usb profile.
BRANCH=none
BUG=chrome-os-partner:11078
TEST=make # all profiles generated.
Change-Id: If280cebb847cdc7a599f510f279df03e1cc9b4d5
Reviewed-on: https://gerrit.chromium.org/gerrit/30810
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Dave Parker <dparker@chromium.org>
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
-rw-r--r-- | scripts/newbitmaps/Makefile | 5 | ||||
-rw-r--r-- | scripts/newbitmaps/images/Makefile | 3 | ||||
-rwxr-xr-x | scripts/newbitmaps/images/build_images | 26 | ||||
-rw-r--r-- | scripts/newbitmaps/images/chrome_logo.png | bin | 1950 -> 2643 bytes | |||
-rw-r--r-- | scripts/newbitmaps/images/divider_btm.png | bin | 157 -> 114 bytes | |||
-rw-r--r-- | scripts/newbitmaps/images/divider_top.png | bin | 369 -> 244 bytes | |||
-rw-r--r-- | scripts/newbitmaps/images/dummy.png | bin | 0 -> 79 bytes |
7 files changed, 31 insertions, 3 deletions
diff --git a/scripts/newbitmaps/Makefile b/scripts/newbitmaps/Makefile index 7a4a526b..8632d8c9 100644 --- a/scripts/newbitmaps/Makefile +++ b/scripts/newbitmaps/Makefile @@ -11,7 +11,10 @@ ALL_LOCALES=en es_419 pt_BR en_GB fr es pt_PT ca it de \ uk tr iw ar fa hi th vi id fil zh_CN zh_TW ko ja # Here are the launch locales for Stumpy/Lumpy (issue 6595), same ordering. -LOCALES=en es_419 pt_BR en_GB fr es it de nl da no sv ko ja +LOCALES=en es_419 pt_BR en_GB fr es it de nl da no sv ko ja \ + +# Added more locales for future (crosbug.com/p/12846). +LOCALES+= id th default: outside_chroot strings images diff --git a/scripts/newbitmaps/images/Makefile b/scripts/newbitmaps/images/Makefile index ab0eede8..ed3933eb 100644 --- a/scripts/newbitmaps/images/Makefile +++ b/scripts/newbitmaps/images/Makefile @@ -10,7 +10,8 @@ # ImageMagick is much to complex to bother installing into the chroot just for # this occasional need. -TARGETS=std s800 s1024 s1024usb2 +TARGETS=std n1366usb2 s800 s1024 s1024usb s1024usb2 + # To generate all locales, make from top level. LOCALES=en diff --git a/scripts/newbitmaps/images/build_images b/scripts/newbitmaps/images/build_images index 0c04b9eb..857e2445 100755 --- a/scripts/newbitmaps/images/build_images +++ b/scripts/newbitmaps/images/build_images @@ -74,6 +74,21 @@ main() { true ;; + # Native profiles + + n1366 ) + # "Native 1366x768" resolution. + background_scale_param="-scale 1366x768!" + ;; + + n1366usb2 ) + # Similar to n1366, and can only boot recovery by SD card or USB2. + background_scale_param="-scale 1366x768!" + replace_files="insert=insert_sd_usb2" + ;; + + # Stretched profiles + s800 ) # "Streched 800x600". Designed for x86 UEFI BIOS (and coreboot), which # always puts display into VESA 800x600 16-bit mode (0x0114), and is @@ -88,6 +103,15 @@ main() { background_scale_param="-scale 1024x768!" ;; + s1024usb ) + # Similar to s1024, and can only boot recovery by USB2. (No card reader, + # not not able to recover from card reader.) + scale_param="-scale 75%x100%" + background_scale_param="-scale 1024x768!" + replace_files="insert=insert_usb BadSD=dummy" + # TODO(hungte) Revise bitmaps so there's no SD card images. + ;; + s1024usb2 ) # Similar to s1024, and can only boot recovery by SD card or USB2. scale_param="-scale 75%x100%" @@ -145,7 +169,7 @@ main() { if [ -n "$replace_files" ]; then echo "Replacing files..." - echo "$replace_files" | while read X; do + echo "$replace_files" | tr ' ' '\n' | while read X; do local Xdest="${X%%=*}" Xsrc="${X##*=}" Xfile="" echo " $Xsrc => $Xdest" for Xfile in $(find "$output" -name "$Xsrc.bmp"); do diff --git a/scripts/newbitmaps/images/chrome_logo.png b/scripts/newbitmaps/images/chrome_logo.png Binary files differindex 1b6685d7..e5251f24 100644 --- a/scripts/newbitmaps/images/chrome_logo.png +++ b/scripts/newbitmaps/images/chrome_logo.png diff --git a/scripts/newbitmaps/images/divider_btm.png b/scripts/newbitmaps/images/divider_btm.png Binary files differindex 84c563ee..0d3e4065 100644 --- a/scripts/newbitmaps/images/divider_btm.png +++ b/scripts/newbitmaps/images/divider_btm.png diff --git a/scripts/newbitmaps/images/divider_top.png b/scripts/newbitmaps/images/divider_top.png Binary files differindex 4f3cd829..f037966c 100644 --- a/scripts/newbitmaps/images/divider_top.png +++ b/scripts/newbitmaps/images/divider_top.png diff --git a/scripts/newbitmaps/images/dummy.png b/scripts/newbitmaps/images/dummy.png Binary files differnew file mode 100644 index 00000000..6404db59 --- /dev/null +++ b/scripts/newbitmaps/images/dummy.png |