Skip to content

Commit

Permalink
scripts: Update mkknlimg, just in case
Browse files Browse the repository at this point in the history
With the removal of the vc_cma driver, mkknlimg lost an indication that
the user had built a downstream kernel. Update the script, adding a few
more key strings, in case it is still being used.

Note that mkknlimg is now deprecated, except to tag kernels as upstream
(283x), and thus requiring upstream DTBs.

See: raspberrypi#2239

Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  • Loading branch information
Phil Elwell authored and popcornmix committed Jan 7, 2018
1 parent 14f2db0 commit 3a86d9c
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions scripts/mkknlimg
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,15 @@ if (! -r $kernel_file)

my $wanted_strings =
{
'bcm2708_fb' => FLAG_PI | FLAG_270X,
'brcm,bcm2835-mmc' => FLAG_PI,
'brcm,bcm2835-sdhost' => FLAG_PI,
'brcm,bcm2708-pinctrl' => FLAG_PI | FLAG_DTOK,
'brcm,bcm2835-gpio' => FLAG_PI | FLAG_DTOK,
'brcm,bcm2708' => FLAG_PI | FLAG_DTOK | FLAG_270X,
'brcm,bcm2709' => FLAG_PI | FLAG_DTOK | FLAG_270X,
'brcm,bcm2708-fb' => FLAG_PI | FLAG_DTOK | FLAG_270X,
'brcm,bcm2708-usb' => FLAG_PI | FLAG_DTOK | FLAG_270X,
'brcm,bcm2835' => FLAG_PI | FLAG_DTOK | FLAG_283X,
'brcm,bcm2836' => FLAG_PI | FLAG_DTOK | FLAG_283X,
'brcm,bcm2837' => FLAG_PI | FLAG_DTOK | FLAG_283X,
'of_cfs_init' => FLAG_DTOK | FLAG_DDTK,
'vc_cma_init' => FLAG_PI | FLAG_270X,
'vc-mem' => FLAG_PI | FLAG_270X,
};

my $res = try_extract($kernel_file, $tmpfile1);
Expand Down

0 comments on commit 3a86d9c

Please sign in to comment.