Update .gitignore for ELKS
PATCH 1/1 Update .gitignore for ELKS
Added generated Makefiles to .gitignore for a clear git status after build.
Please don't take the changes related to the new Flash block device in ELKS configuration. I forgot to branch before starting that code :-/
Regards,
MFLD
From 74af04d7f14a984206155a77e736bc083d35e1da Mon Sep 17 00:00:00 2001
From: "mfld.fr" <[email protected]>
Date: Fri, 27 Mar 2015 19:30:46 +0100
Subject: [PATCH] Added generated Makefiles to .gitignore
--- .gitignore | 2 + elks/Documentation/Configure.help | 20 +++++++ elks/arch/i86/286pmode/Makefile | 55 ------------------- elks/arch/i86/boot/Makefile | 29 ---------- elks/arch/i86/defconfig | 1 + elks/arch/i86/drivers/block/Config.in | 4 ++ elks/arch/i86/drivers/block/Makefile | 59 -------------------- elks/arch/i86/drivers/char/Makefile | 87 ----------------------------- elks/arch/i86/kernel/Makefile | 68 ----------------------- elks/arch/i86/lib/Makefile | 75 ------------------------- elks/arch/i86/mm/Makefile | 56 ------------------- elks/arch/i86/sibo/Makefile | 28 ---------- elks/arch/i86/tools/Makefile | 77 -------------------------- elks/fs/Makefile | 57 ------------------- elks/fs/minix/Makefile | 55 ------------------- elks/fs/romfs/Makefile | 55 ------------------- elks/init/Makefile | 28 ---------- elks/kernel/Makefile | 56 ------------------- elks/lib/Makefile | 56 ------------------- elks/net/Makefile | 61 --------------------- elks/net/ipv4/Makefile | 28 ---------- elks/net/nano/Makefile | 28 ---------- elks/net/unix/Makefile | 28 ---------- elks/scripts/Makefile | 78 -------------------------- elks/scripts/lxdialog/Makefile | 100 ---------------------------------- elks/video/ansi/Makefile | 28 ---------- 26 files changed, 27 insertions(+), 1192 deletions(-) delete mode 100644 elks/arch/i86/286pmode/Makefile delete mode 100644 elks/arch/i86/boot/Makefile delete mode 100644 elks/arch/i86/drivers/block/Makefile delete mode 100644 elks/arch/i86/drivers/char/Makefile delete mode 100644 elks/arch/i86/kernel/Makefile delete mode 100644 elks/arch/i86/lib/Makefile delete mode 100644 elks/arch/i86/mm/Makefile delete mode 100644 elks/arch/i86/sibo/Makefile delete mode 100644 elks/arch/i86/tools/Makefile delete mode 100644 elks/fs/Makefile delete mode 100644 elks/fs/minix/Makefile delete mode 100644 elks/fs/romfs/Makefile delete mode 100644 elks/init/Makefile delete mode 100644 elks/kernel/Makefile delete mode 100644 elks/lib/Makefile delete mode 100644 elks/net/Makefile delete mode 100644 elks/net/ipv4/Makefile delete mode 100644 elks/net/nano/Makefile delete mode 100644 elks/net/unix/Makefile delete mode 100644 elks/scripts/Makefile delete mode 100644 elks/scripts/lxdialog/Makefile delete mode 100644 elks/video/ansi/Makefile
.gitignore +2 -0
@@ -12,6 +12,7 @@ Config.in dev86 .config .config.old +Makefile # # Never ignore these
@@ -29,6 +30,7 @@ elks/arch/i86/boot/bootsect elks/arch/i86/boot/setup elks/arch/i86/boot/system elks/arch/i86/drivers/char/KeyMaps/keymaps.h +elks/arch/i86/Image elks/arch/i86/kernel/entry.c elks/arch/i86/tools/build elks/arch/i86/tools/mkbootloader
elks/Documentation/Configure.help +20 -0
@@ -565,6 +565,26 @@ CONFIG_BLK_DEV_HD Currently not tested. Use at you own risk. +Flash memory support +CONFIG_BLK_DEV_FLASH + Device driver to access to the Flash memory that is located + at the upper address space and that contains the bootstrap, + the first-stage loader and the BIOS. + + Used on embedded systems to flash the second-stage loader, + the kernel and the initial RAM disk (initrd). + + This driver is experimental and uses the standard Flash software + commands to erase or write sectors. Typical sector size is 4K. + +Flash lowest segment +CONFIG_BLK_DEV_FLASH_LOW + Lowest segment of the Flash memory. Default is F000 for a 64K + memory that includes the bootstrap at FFFF:0. + + Adjust this parameter to the actual size of your Flash memory + on your system to be able to read and program the whole chip. + RAM Drive support CONFIG_BLK_DEV_RAM Support for a RAM disk device driver which allows up to eight
elks/arch/i86/286pmode/Makefile deleted +0 -55
55 lines not on this page · raw message
elks/arch/i86/boot/Makefile deleted +0 -29
@@ -1,29 +0,0 @@ -# Note that the standard Makefile rules and defines have been moved to -# the file below. - -BASEDIR = ../../.. - -######################################################################### -# Define the variables required by the standard rules - see the standard -# rules file (below) for details of these variables. - -USEBCC = Y - -CLEANDEP = - -CLEANME = Image bootsect nbImage nbImage.rd netbootsect setup \ - system system.app - -DEPEND = - -DISTFILES = empty system.afl system.rsz tux.pic - -NOINDENT = crt1.c - -######################################################################### -# Include the standard rules. - -include $(BASEDIR)/Makefile-rules - -######################################################################### -### Dependencies:
elks/arch/i86/defconfig +1 -0
@@ -114,6 +114,7 @@ CONFIG_BLK_DEV_FD=n CONFIG_BLK_DEV_HD=n CONFIG_DMA=n CONFIG_BLK_DEV_RAM=n +CONFIG_BLK_DEV_FLASH=n CONFIG_BLK_DEV_CHAR=y #
elks/arch/i86/drivers/block/Config.in +4 -0
@@ -33,6 +33,10 @@ mainmenu_option next_comment if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then bool 'Normal floppy disk support' CONFIG_BLK_DEV_FD n bool 'Normal IDE hardisk support' CONFIG_BLK_DEV_HD n + bool 'Flash memory support' CONFIG_BLK_DEV_FLASH n + fi + if [ "$CONFIG_BLK_DEV_FLASH" = "y" ]; then + hex 'Flash lowest segment' CONFIG_BLK_DEV_FLASH_LOW 0xF000 fi if [ "$CONFIG_BLK_DEV_FD" = "y" ]; then define_bool CONFIG_DMA y
elks/arch/i86/drivers/block/Makefile deleted +0 -59
59 lines not on this page · raw message
elks/arch/i86/drivers/char/Makefile deleted +0 -87
87 lines not on this page · raw message
elks/arch/i86/kernel/Makefile deleted +0 -68
68 lines not on this page · raw message
elks/arch/i86/lib/Makefile deleted +0 -75
75 lines not on this page · raw message
elks/arch/i86/mm/Makefile deleted +0 -56
56 lines not on this page · raw message
elks/arch/i86/sibo/Makefile deleted +0 -28
@@ -1,28 +0,0 @@ -# Note that the standard Makefile rules and defines have been moved to -# the file below. - -BASEDIR = ../../.. - -######################################################################### -# Define the variables required by the standard rules - see the standard -# rules file (below) for details of these variables. - -USEBCC = Y - -CLEANDEP = - -CLEANME = - -DEPEND = - -DISTFILES = - -NOINDENT = crt1.c irqtab.c - -######################################################################### -# Include the standard rules. - -include $(BASEDIR)/Makefile-rules - -######################################################################### -### Dependencies:
elks/arch/i86/tools/Makefile deleted +0 -77
77 lines not on this page · raw message
elks/fs/Makefile deleted +0 -57
57 lines not on this page · raw message
elks/fs/minix/Makefile deleted +0 -55
55 lines not on this page · raw message
elks/fs/romfs/Makefile deleted +0 -55
55 lines not on this page · raw message
elks/init/Makefile deleted +0 -28
@@ -1,28 +0,0 @@ -# Note that the standard Makefile rules and defines have been moved to -# the file below. - -BASEDIR = .. - -######################################################################### -# Define the variables required by the standard rules - see the standard -# rules file (below) for details of these variables. - -USEBCC = Y - -CLEANDEP = - -CLEANME = - -DEPEND = - -DISTFILES = - -NOINDENT = main.c - -######################################################################### -# Include the standard rules. - -include $(BASEDIR)/Makefile-rules - -######################################################################### -### Dependencies:
elks/kernel/Makefile deleted +0 -56
56 lines not on this page · raw message
elks/lib/Makefile deleted +0 -56
56 lines not on this page · raw message
elks/net/Makefile deleted +0 -61
61 lines not on this page · raw message
elks/net/ipv4/Makefile deleted +0 -28
@@ -1,28 +0,0 @@ -# Note that the standard Makefile rules and defines have been moved to -# the file below. - -BASEDIR = ../.. - -######################################################################### -# Define the variables required by the standard rules - see the standard -# rules file (below) for details of these variables. - -USEBCC = Y - -CLEANDEP = - -CLEANME = - -DEPEND = - -DISTFILES = - -NOINDENT = - -######################################################################### -# Include the standard rules. - -include $(BASEDIR)/Makefile-rules - -######################################################################### -### Dependencies:
elks/net/nano/Makefile deleted +0 -28
@@ -1,28 +0,0 @@ -# Note that the standard Makefile rules and defines have been moved to -# the file below. - -BASEDIR = ../.. - -######################################################################### -# Define the variables required by the standard rules - see the standard -# rules file (below) for details of these variables. - -USEBCC = Y - -CLEANDEP = - -CLEANME = - -DEPEND = - -DISTFILES = - -NOINDENT = - -######################################################################### -# Include the standard rules. - -include $(BASEDIR)/Makefile-rules - -######################################################################### -### Dependencies:
elks/net/unix/Makefile deleted +0 -28
@@ -1,28 +0,0 @@ -# Note that the standard Makefile rules and defines have been moved to -# the file below. - -BASEDIR = ../.. - -######################################################################### -# Define the variables required by the standard rules - see the standard -# rules file (below) for details of these variables. - -USEBCC = Y - -CLEANDEP = - -CLEANME = - -DEPEND = - -DISTFILES = - -NOINDENT = - -######################################################################### -# Include the standard rules. - -include $(BASEDIR)/Makefile-rules - -######################################################################### -### Dependencies:
elks/scripts/Makefile deleted +0 -78
78 lines not on this page · raw message
elks/scripts/lxdialog/Makefile deleted +0 -100
100 lines not on this page · raw message
elks/video/ansi/Makefile deleted +0 -28
@@ -1,28 +0,0 @@ -# Note that the standard Makefile rules and defines have been moved to -# the file below. - -BASEDIR = ../.. - -######################################################################### -# Define the variables required by the standard rules - see the standard -# rules file (below) for details of these variables. - -USEBCC = Y - -CLEANDEP = - -CLEANME = - -DEPEND = - -DISTFILES = - -NOINDENT = - -######################################################################### -# Include the standard rules. - -include $(BASEDIR)/Makefile-rules - -######################################################################### -### Dependencies:
Signature · 1 line
2.0.5
Quoted 1 line · MFLD
Added generated Makefiles to .gitignore for a clear git status after build.
I committed this change, but then the build process consistently failed. I've reverted the commits that added this change; some of the Makefiles need to be there for builds to work and don't seem to get generated.
Yes, I got the same error afterward, sorry for the trouble.
From now, I will work in my own branch and mature the changes before submitting them.
Thanks,
MFLD
Le 27/03/2015 23:40, Jody Bruchon a écrit :
Quoted 10 lines · MFLD
Quoted 1 line
Added generated Makefiles to .gitignore for a clear git status after build.
I committed this change, but then the build process consistently failed. I've reverted the commits that added this change; some of the Makefiles need to be there for builds to work and don't seem to get generated.
Signature · 3 lines
To unsubscribe from this list: send the line "unsubscribe linux-8086" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-8086" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html