Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8cc1278c authored by derfelot's avatar derfelot
Browse files

scripts: Add Sony diffconfig support 

Taken from Sony 47.2.A.10.107 stock kernel
parent 534db831

scripts/autoconfig.pl

0 → 100644
+288 −0
Original line number Diff line number Diff line 
#!/usr/bin/perl



# scripts/defconfig.pl

#

# Copyright (C) 2011 Sony Ericsson Mobile Communications AB.

#

# Author: Martin Danielsson <martin.danielsson@sonyericsson.com>

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License version 2, as

# published by the Free Software Foundation; either version 2

# of the License, or (at your option) any later version.



use strict;

use warnings;



use Cwd 'abs_path';

use File::Copy;



my $defconfig;

my $kernel_dir;

my $config_dir;

my @products = ();

my $keep_tempconfig;



# Print usage instructions

#

# In: Error message to display

sub usage($)

{

	my ($msg) = @_;



	print "\n";

	print "Error: $msg\n\n" if ($msg ne "");



	print "This script is used to perform one or more tasks on a set of\n";

	print "defconfig files. The result will be the same as if the\n";

	print "product configuration was done using menuconfig or similar\n";

	print "tool.\n\n";



	print "Usage: ";

	print "autoconfig.pl [-k] -t <action>[:<key>[=<value>]] <products>\n\n";



	print "-k: keep .config file after execution\n";

	print "\t.config file is removed as default behavior\n";

	print "\tbecause remaining .config file causes build error\n";

	print "\tuse this flag to stop removing (for debug purpose)\n";

	print "-t: task for new configuration\n";

	print "<action> - action to perform\n";

	print "\ts: sync defconfig with Kconfig (s)\n";

	print "\ta: set a configuration (a:<key>=<value>)\n";

	print "\td: unset a configuration (d:<key>)\n";

	print "<key> - a configuration flag, for instance CONFIG_SWAP\n";

	print "<value> - the value to set, for instance y, n or 1000\n";

	print "Examples:\n";

	print "\tSync all defconfigs with Kconfig\n";

	print "\t\$ autoconfig.pl -t s\n\n";

	print "\tEnable CONFIG_SWAP for Anzu and Hallon\n";

	print "\t\$ autoconfig.pl -t a:CONFIG_SWAP=y anzu hallon\n\n";

	print "\tDisable CONFIG_USB_SUPPORT for all products\n";

	print "\t\$ autoconfig.pl -t d:CONFIG_USB_SUPPORT\n\n";

	print "\tSet CONFIG_MSM_AMSS_VERSION to 1000 for Anzu\n";

	print "\t\$ autoconfig.pl -t a:CONFIG_MSM_AMSS_VERSION=1000 anzu\n";

	print "\n";

}



# Apply a modification to a defconfig file

#

# In: The key

# In: The value

sub apply_modification($$)

{

	my ($key, $value) = @_;



	# Settings are applied by inserting them at the end of the defconfig

	# file. The kernel build system will later move it to the correct

	# location and handle any duplicate entries. It will also perform

	# validation of integer values.

	my $file = ".config";

	open DEFCONFIG, ">>$file" or die "Failed to open file, $file";

	if ($value eq "n") {

		print DEFCONFIG "\n# $key is not set\n";

	} else {

		print DEFCONFIG "\n$key=$value\n";

	}

	close DEFCONFIG;

}



sub perform_task_diffconfig($$$)

{

	my ($action, $key, $value) = @_;

	opendir Dir, "$config_dir/diffconfig" or exit 0;

	foreach (readdir Dir) {

		if (/([\w-]+)_diffconfig/) {

			if ($action eq "s") {

				print "Syncing $_ ...\n";

			}

			if (@products != 0) {

				if (is_product_selected($1) == 0) {

					next;

				}

				if ($action eq "a") {

					print "Setting $key=$value in $_...\n";

				} elsif ($action eq "d") {

					print "Removing $key in $_...\n";

				}

			}

			if ((is_product_excluded($1) == 0)) {

				$ENV{'KBUILD_DIFFCONFIG'} = $_;

				system "make ARCH=arm64 `basename $defconfig` > /dev/null 2>&1";

				if ($action ne "s") {

					apply_modification($key, $value);

					system "make ARCH=arm64 `basename olddefconfig` > /dev/null 2>&1";

				}

				$ENV{'KBUILD_DIFFCONFIG'} = $_;

				system "make ARCH=arm64 savediffconfig > /dev/null 2>&1";

				move("diffconfig", "$config_dir/diffconfig/$_")

						or die "failed to copy file";

			}

		}

	}

	close Dir;

}





# Perform a task on a specific defconfig

#

# In: The action

# In: The key

# In: The value

sub perform_task_defconfig($$$)

{

	my ($action, $key, $value) = @_;



	if ($action eq "s") {

		print "Syncing $defconfig ...\n";

	} elsif ($action eq "a") {

		print "Setting $key=$value ...\n";

	} elsif ($action eq "d") {

		print "Removing $key ...\n";

	}



	if (@products == 0) {

		#Updating the common diffconfig

		my $option ="KCONFIG_NOTIMESTAMP=true";

		$ENV{'KBUILD_DIFFCONFIG'} = "common_diffconfig";

		system "make ARCH=arm64 `basename $defconfig` > /dev/null 2>&1";

		if ($action ne "s") {

			apply_modification($key, $value);

			system "make ARCH=arm64 olddefconfig > /dev/null 2>&1";

		}

		system "make ARCH=arm64 savecommondiffconfig > /dev/null 2>&1";

		move("diffconfig.common", "$config_dir/diffconfig/common_diffconfig")

			or die "failed to copy file";

	}



	perform_task_diffconfig($action, $key, $value);

}







# Parse a task description string

#

# In: The task description string

# Out: A ($action, $key, $value) array. In case of error $action is set to "-"

sub parse_task_description($)

{

	my ($task) = @_;



	my $action = "";

	my $key = "";

	my $value = "";

	if ($task =~ /^([sda])/) {

		$action = $1;

	} else {

		print "unknown action, $task\n";

		return ("-", "", "");

	}

	my $error = 1;

	if ($action eq "s") {

		$error = 0;

	} elsif ($action eq "a") {

		if ($task =~ /^a:(\w+)=(.+)/) {

			$key = $1;

			$value = $2;

			$error = 0;

		}

	} elsif ($action eq "d") {

		if ($task =~ /^d:(\w+)/) {

			$key = $1;

			$value = "n";

			$error = 0;

		}

	}

	if ($error == 1) {

		print "incorrect task description, $task\n";

		return ("-", "", "");

	}



	return ($action, $key, $value);

}



# Check if a product should be excluded

#

# In: The product to check

# Out: 1 if the product is excluded, 0 otherwise

sub is_product_excluded($)

{

	my ($product) = @_;



	if ($product =~ /_capk/) {

		return 1;

	}



	if ($product =~ /common/) {

		return 1;

	}



	return 0;

}



# Check if a product has been selected for processing

#

# In: The product to check

# Out: 1 if the product selected, 0 otherwise

sub is_product_selected($)

{

	my ($product) = @_;



	if (@products == 0) {

		return 1;

	}

	foreach (@products) {

		if ($product eq $_) {

			return 1;

		}

	}



	return 0;

}



### Program starts here ###



# Figure out the path to the kernel directory and move to it

$defconfig = "msmcortex-perf_defconfig";

$kernel_dir = abs_path($0);

$kernel_dir =~ s!/scripts/.*\.pl!!;

chdir $kernel_dir or die "couldn't move to kernel directory, $kernel_dir\n";

$config_dir = "$kernel_dir/arch/arm64/configs";

$keep_tempconfig = 0;



# Parse command line arguments

my @tasks = ();

my $iter = 0;

my $flag = 0;

while ($iter < @ARGV) {

	if ($ARGV[$iter] eq "-t") {

		$iter++;

		if ($iter >= @ARGV) {

			usage("not enough arguments");

			exit 0;

		}

		push @tasks, $ARGV[$iter];

	} elsif ($ARGV[$iter] eq "-h") {

		usage("");

		exit 0;

	} elsif ($ARGV[$iter] eq "-k") {

		$keep_tempconfig = 1;

	} else {

		push @products, $ARGV[$iter];

	}

	$iter++;

}



# Apply the tasks one at a time for each selected product

if (@tasks == 0) {

	usage("no task specified");

	exit 0;

}

my $task;

foreach $task (@tasks) {

	my ($action, $key, $value) = parse_task_description($task);

	next if ($action eq "-");

	perform_task_defconfig($action, $key, $value);

	if ($keep_tempconfig == 0) {

		system "make mrproper";

	}

}

scripts/gcc-wrapper.py

+5 −5
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ def interpret_warning(line): 
    line = line.rstrip('\n')

    m = warning_re.match(line)

    if m and m.group(2) not in allowed_warnings:

        print >> sys.stderr, "error, forbidden warning:", m.group(2)

        print "error, forbidden warning:", m.group(2)



        # If there is a warning, remove any object if it exists.

        if ofile:
@@ -80,17 +80,17 @@ def run_gcc(): 
    try:

        proc = subprocess.Popen(args, stderr=subprocess.PIPE)

        for line in proc.stderr:

            print >> sys.stderr, line,

            print line,

            interpret_warning(line)



        result = proc.wait()

    except OSError as e:

        result = e.errno

        if result == errno.ENOENT:

            print >> sys.stderr, args[0] + ':',e.strerror

            print >> sys.stderr, 'Is your PATH set correctly?'

            print args[0] + ':',e.strerror

            print 'Is your PATH set correctly?'

        else:

            print >> sys.stderr, ' '.join(args), str(e)

            print ' '.join(args), str(e)



    return result

scripts/kconfig/Makefile

+23 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# These targets are used from top-level makefile



PHONY += xconfig gconfig menuconfig config silentoldconfig update-po-config \

	localmodconfig localyesconfig

	localmodconfig localyesconfig savediffconfig



ifdef KBUILD_KCONFIG

Kconfig := $(KBUILD_KCONFIG)
@@ -93,6 +93,18 @@ oldnoconfig: olddefconfig 
savedefconfig: $(obj)/conf

	$< $(silent) --$@=defconfig $(Kconfig)



savecommondiffconfig:

ifneq ($(KBUILD_DIFFCONFIG), )

	$(Q)$(srctree)/scripts/diffconfig -m .config.def .config > diffconfig.common

	$(Q)rm -f .config.def .config.common

endif



savediffconfig:

ifneq ($(KBUILD_DIFFCONFIG), )

	$(Q)$(srctree)/scripts/diffconfig -m .config.common .config > diffconfig

	$(Q)rm -f .config.def .config.common

endif



defconfig: $(obj)/conf

ifeq ($(KBUILD_DEFCONFIG),)

	$< $(silent) --defconfig $(Kconfig)
@@ -108,6 +120,16 @@ endif 


%_defconfig: $(obj)/conf

	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)

ifneq ($(KBUILD_DIFFCONFIG), )

	$(Q)cp -f .config .config.def

	$(Q)$(srctree)/$(obj)/merge_config.sh -m .config \

		$(srctree)/arch/$(SRCARCH)/configs/diffconfig/common_diffconfig

	$(Q)$< --olddefconfig $(Kconfig)

	$(Q)cp -f .config .config.common

	$(Q)$(srctree)/$(obj)/merge_config.sh -m .config \

		$(srctree)/arch/$(SRCARCH)/configs/diffconfig/$(KBUILD_DIFFCONFIG)

	$(Q)$< --defconfig=.config $(Kconfig)

endif



configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)