Commit 093faa1d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 

* ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  kbuild: restore arch/{ppc/xtensa}/boot cflags
  kconfig: set title bar in xconfig
  kbuild: fix toplevel Makefile/depmod
parents 6ce59b46 437374e9

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1505,7 +1505,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) 
# and we build for the host arch

quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)

      cmd_depmod = \

	if [ -r System.map -a -x $(DEPMOD) -a "$(SUBARCH)" == "$(ARCH)" ]; then \

	if [ -r System.map -a -x $(DEPMOD) -a "$(SUBARCH)" = "$(ARCH)" ]; then \

		$(DEPMOD) -ae -F System.map                                     \

		$(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) -r)   \

		$(KERNELRELEASE);                                               \

arch/ppc/boot/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
# modified by Cort (cort@cs.nmt.edu)

#



# KBUILD_CFLAGS used when building rest of boot (takes effect recursively)

KBUILD_CFLAGS 	+= -fno-builtin -D__BOOTER__ -Iarch/$(ARCH)/boot/include

HOSTCFLAGS	+= -Iarch/$(ARCH)/boot/include



BOOT_TARGETS	= zImage zImage.initrd znetboot znetboot.initrd

arch/xtensa/boot/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
#





EXTRA_CFLAGS	+= -fno-builtin -Iarch/$(ARCH)/boot/include

# KBUILD_CFLAGS used when building rest of boot (takes effect recursively)

KBUILD_CFLAGS	+= -fno-builtin -Iarch/$(ARCH)/boot/include

HOSTFLAGS	+= -Iarch/$(ARCH)/boot/include



BIG_ENDIAN	:= $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#")

scripts/kconfig/qconf.cc

+4 −0
Original line number Diff line number Diff line
@@ -1274,8 +1274,12 @@ ConfigMainWindow::ConfigMainWindow(void) 
	QMenuBar* menu;

	bool ok;

	int x, y, width, height;

	char title[256];



	QWidget *d = configApp->desktop();

	snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"),

		getenv("KERNELVERSION"));

	setCaption(title);



	width = configSettings->readNumEntry("/window width", d->width() - 64);

	height = configSettings->readNumEntry("/window height", d->height() - 64);