target/linux/brcm2708/patches-4.14/950-0124-scripts-Update-mkknlimg-just-in-case.patch

   1 From e28a3464c66b5d137de4acb6595ff56a1da7d149 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Wed, 25 Oct 2017 09:20:56 +0100
   4 Subject: [PATCH 124/454] scripts: Update mkknlimg, just in case
   5
   6 With the removal of the vc_cma driver, mkknlimg lost an indication that
   7 the user had built a downstream kernel. Update the script, adding a few
   8 more key strings, in case it is still being used.
   9
  10 Note that mkknlimg is now deprecated, except to tag kernels as upstream
  11 (283x), and thus requiring upstream DTBs.
  12
  13 See: https://github.com/raspberrypi/linux/issues/2239
  14
  15 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  16 ---
  17  scripts/mkknlimg | 9 +++------
  18  1 file changed, 3 insertions(+), 6 deletions(-)
  19
  20 --- a/scripts/mkknlimg
  21 +++ b/scripts/mkknlimg
  22 @@ -68,18 +68,15 @@ if (! -r $kernel_file)
  23
  24  my $wanted_strings =
  25  {
  26 -       'bcm2708_fb' => FLAG_PI | FLAG_270X,
  27         'brcm,bcm2835-mmc' => FLAG_PI,
  28         'brcm,bcm2835-sdhost' => FLAG_PI,
  29 -       'brcm,bcm2708-pinctrl' => FLAG_PI | FLAG_DTOK,
  30         'brcm,bcm2835-gpio' => FLAG_PI | FLAG_DTOK,
  31 -       'brcm,bcm2708' => FLAG_PI | FLAG_DTOK | FLAG_270X,
  32 -       'brcm,bcm2709' => FLAG_PI | FLAG_DTOK | FLAG_270X,
  33 +       'brcm,bcm2708-fb'   => FLAG_PI | FLAG_DTOK | FLAG_270X,
  34 +       'brcm,bcm2708-usb'  => FLAG_PI | FLAG_DTOK | FLAG_270X,
  35         'brcm,bcm2835' => FLAG_PI | FLAG_DTOK | FLAG_283X,
  36         'brcm,bcm2836' => FLAG_PI | FLAG_DTOK | FLAG_283X,
  37 +       'brcm,bcm2837' => FLAG_PI | FLAG_DTOK | FLAG_283X,
  38         'of_cfs_init' => FLAG_DTOK | FLAG_DDTK,
  39 -       'vc_cma_init' => FLAG_PI | FLAG_270X,
  40 -       'vc-mem' => FLAG_PI | FLAG_270X,
  41  };
  42
  43  my $res = try_extract($kernel_file, $tmpfile1);