ARM: nati_slsc_defconfig: Add kernel config for SLSC #228
Conversation
7be1b85 to
26cd244
Compare
Migrated nati_slsc_defconfig related changes from branch dev/slsc/1.0/4.1 to ni/linux repo branch nilrt/master/6.6. The commits: 303dc0c nati_slsc_defconfig: Add kernel config for SLSC 80e6a2d nati_slsc_defconfig: Add squashfs filesystem support 25a229e nati_slsc_defconfig: Make m25p80 KLM 0963a8e nati_slsc_defconfig: replace IPv4 with IPv6 in kernel config 055c54c nati_slsc_defconfig: Enable UIO driver with Generic IRQ 13f640f nati_slsc_defconfig: Remove trailing whitespace 3f04587 nati_slsc_defconfig: Remove stale features in defconfig 1d6589b nati_slsc_defconfig: Remove invalid comment in defconfig 04f4aa4 nati_slsc_defconfig: Enable AD7291 driver Signed-off-by: Sien <sien.wu@ni.com> Signed-off-by: George Huang <george.huang@ni.com> Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
26cd244 to
fd858d1
Compare
There was a problem hiding this comment.
Signed-off-by: Sien sien.wu@ni.com
Signed-off-by: George Huang george.huang@ni.com
Were these people directly involved with this commit or did you copy their signed-off-by tags from the original commits before squashing? If the later, I don't think this is necessary.
| @@ -0,0 +1,296 @@ | |||
| CONFIG_LOCALVERSION="-ni" | |||
There was a problem hiding this comment.
Was this defconfig updated with make savedefconfig?
There was a problem hiding this comment.
yes, this is what I obtained:
kaewoei@my-pen-rd22:~/dev/kernel/fork/linux$ ARCH=arm make nati_slsc_defconfig
HOSTCC scripts/basic/fixdep
HOSTCC scripts/kconfig/conf.o
HOSTCC scripts/kconfig/confdata.o
HOSTCC scripts/kconfig/expr.o
LEX scripts/kconfig/lexer.lex.c
YACC scripts/kconfig/parser.tab.[ch]
HOSTCC scripts/kconfig/lexer.lex.o
HOSTCC scripts/kconfig/menu.o
HOSTCC scripts/kconfig/parser.tab.o
HOSTCC scripts/kconfig/preprocess.o
HOSTCC scripts/kconfig/symbol.o
HOSTCC scripts/kconfig/util.o
HOSTLD scripts/kconfig/conf
#
# configuration written to .config
#
kaewoei@my-pen-rd22:~/dev/kernel/fork/linux$ cat .config | grep CONFIG_LOCALVERSION
CONFIG_LOCALVERSION="-ni"
CONFIG_LOCALVERSION_AUTO=y
kaewoei@my-pen-rd22:~/dev/kernel/fork/linux$ make savedefconfig
kaewoei@my-pen-rd22:~/dev/kernel/fork/linux$ cat defconfig | grep CONFIG_LOCALVERSION
CONFIG_LOCALVERSION="-ni"
There was a problem hiding this comment.
I made the comment on the 1st line of this file not necessarily because of any issue with CONFIG_LOCALVERSION.. but generally for the whole file (because GitHub doesn't allow comments on whole file).
The defconfig generated after ARCH=arm make nati_slsc_defconfig && ARCH=arm make savedefconfig should be the same as nati_slsc_defconfig (e.g., this is the check we have for nati_x86_64_defconfig).
I ran the commands locally and see that that's not the case here. Please update nati_slsc_defconfig.
You may also want to update the commit message to say that it was regenerated. E.g., dca8306.
There was a problem hiding this comment.
I see that you've more commits you want to cherry-pick that'll change this defconfig. So I'm also ok with doing the defconfig regeneration in that other PR.
There was a problem hiding this comment.
I got what you mean, also observed bluefin has made changes in commit d3db949. OK, I will do the defconfig regeneration after complete cherry picking the remaining defconfig changes from kernel 4.1.
This checkpatch warning can be ignored |
George and Sien were the authors and sign-of-by of the original patches. I copied their signed-off-by tags into squashed commit's description. :) |
|
Cherry picked in |
migrated nati_slsc_defconfig related changes from branch dev/slsc/1.0/4.1 to ni/linux repo branch nilrt/master/6.6.
the commits:
303dc0c24ea3 nati_slsc_defconfig: Add kernel config for SLSC
80e6a2d2885f nati_slsc_defconfig : Add squashfs filesystem support
25a229ee23f6 nati_slsc_defconfig: Make m25p80 KLM
0963a8e151f6 nati_slsc_defconfig: replace IPv4 with IPv6 in kernel config
055c54c04c17 nati_slsc_defconfig: Enable UIO driver with Generic IRQ
13f640fcba03 nati_slsc_defconfig: Remove trailing whitespace
3f04587962f3 nati_slsc_defconfig: Remove stale features in defconfig
1d6589b68afa nati_slsc_defconfig: Remove invalid comment in defconfig
04f4aa451415 nati_slsc_defconfig: Enable AD7291 driver
there will be separate PR for 01206af5a8ba commit where the patch involved both nati_slsc_defconfig and ni-slsc-12001.dts.
WI: AB#3014041