~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,26 +1,25 @@
1		-CONFIG_SGI_IP32=y
2		-# CONFIG_SECCOMP is not set
3	1	CONFIG_SYSVIPC=y
4	2	CONFIG_POSIX_MQUEUE=y
5		-CONFIG_BSD_PROCESS_ACCT=y
6	3	CONFIG_AUDIT=y
	4	+CONFIG_BSD_PROCESS_ACCT=y
7	5	CONFIG_IKCONFIG=y
8	6	CONFIG_IKCONFIG_PROC=y
9	7	CONFIG_LOG_BUF_SHIFT=14
10		-CONFIG_SYSFS_DEPRECATED_V2=y
11	8	CONFIG_RELAY=y
12	9	CONFIG_EXPERT=y
13	10	CONFIG_SLAB=y
14	11	CONFIG_PROFILING=y
	12	+CONFIG_SGI_IP32=y
	13	+# CONFIG_SECCOMP is not set
	14	+CONFIG_PCI=y
	15	+CONFIG_MIPS32_O32=y
	16	+CONFIG_MIPS32_N32=y
15	17	CONFIG_OPROFILE=m
16	18	CONFIG_MODULES=y
17	19	CONFIG_MODULE_UNLOAD=y
18		-# CONFIG_BLK_DEV_BSG is not set
19		-CONFIG_PCI=y
	20	+CONFIG_PARTITION_ADVANCED=y
	21	+CONFIG_SGI_PARTITION=y
20	22	CONFIG_BINFMT_MISC=y
21		-CONFIG_MIPS32_COMPAT=y
22		-CONFIG_MIPS32_O32=y
23		-CONFIG_MIPS32_N32=y
24	23	CONFIG_NET=y
25	24	CONFIG_PACKET=y
26	25	CONFIG_UNIX=y
..	..	@@ -33,7 +32,6 @@
33	32	CONFIG_IP_PNP_DHCP=y
34	33	CONFIG_IP_PNP_BOOTP=y
35	34	CONFIG_NET_IPIP=m
36		-CONFIG_NET_IPGRE=m
37	35	CONFIG_INET_AH=m
38	36	CONFIG_INET_ESP=m
39	37	CONFIG_INET_IPCOMP=m
..	..	@@ -44,35 +42,29 @@
44	42	CONFIG_INET6_IPCOMP=m
45	43	CONFIG_IPV6_TUNNEL=m
46	44	CONFIG_NETWORK_SECMARK=y
47		-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
48	45	CONFIG_CONNECTOR=y
49	46	CONFIG_BLK_DEV_LOOP=m
50	47	CONFIG_BLK_DEV_CRYPTOLOOP=m
51	48	CONFIG_BLK_DEV_NBD=m
52		-CONFIG_SGI_IOC4=y
53	49	CONFIG_RAID_ATTRS=y
54	50	CONFIG_SCSI=y
55	51	CONFIG_BLK_DEV_SD=y
56	52	CONFIG_BLK_DEV_SR=y
57	53	CONFIG_CHR_DEV_SG=m
58		-CONFIG_SCSI_MULTI_LUN=y
59	54	CONFIG_SCSI_CONSTANTS=y
60	55	CONFIG_SCSI_LOGGING=y
61	56	CONFIG_SCSI_SCAN_ASYNC=y
62	57	CONFIG_SCSI_SAS_LIBSAS=y
63		-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
64	58	CONFIG_SCSI_AIC7XXX=y
65	59	CONFIG_AIC7XXX_RESET_DELAY_MS=15000
66	60	CONFIG_NETDEVICES=y
67		-CONFIG_DUMMY=m
68	61	CONFIG_BONDING=m
69		-CONFIG_NET_ETHERNET=y
70		-CONFIG_MII=y
71		-CONFIG_SGI_O2MACE_ETH=y
	62	+CONFIG_DUMMY=m
72	63	CONFIG_NET_TULIP=y
73	64	CONFIG_DE2104X=m
74	65	CONFIG_TULIP=m
75	66	CONFIG_TULIP_MMIO=y
	67	+CONFIG_SGI_O2MACE_ETH=y
76	68	CONFIG_INPUT_EVDEV=m
77	69	CONFIG_SERIO_MACEPS2=y
78	70	CONFIG_SERIO_RAW=y
..	..	@@ -86,9 +78,6 @@
86	78	CONFIG_FB_GBE=y
87	79	# CONFIG_VGA_CONSOLE is not set
88	80	CONFIG_FRAMEBUFFER_CONSOLE=y
89		-CONFIG_FONTS=y
90		-CONFIG_FONT_8x8=y
91		-CONFIG_FONT_8x16=y
92	81	CONFIG_LOGO=y
93	82	# CONFIG_LOGO_LINUX_MONO is not set
94	83	# CONFIG_LOGO_LINUX_VGA16 is not set
..	..	@@ -99,7 +88,6 @@
99	88	# CONFIG_RTC_INTF_SYSFS is not set
100	89	# CONFIG_RTC_INTF_PROC is not set
101	90	CONFIG_RTC_DRV_DS1685_FAMILY=y
102		-CONFIG_RTC_DRV_DS1685=y
103	91	CONFIG_EXT2_FS=y
104	92	CONFIG_EXT2_FS_XATTR=y
105	93	CONFIG_EXT2_FS_POSIX_ACL=y
..	..	@@ -123,13 +111,10 @@
123	111	CONFIG_TMPFS_POSIX_ACL=y
124	112	CONFIG_CONFIGFS_FS=y
125	113	CONFIG_NFS_FS=y
126		-CONFIG_NFS_V3=y
127	114	CONFIG_ROOT_NFS=y
128	115	CONFIG_NFSD=m
129	116	CONFIG_NFSD_V3=y
130	117	CONFIG_CIFS=m
131		-CONFIG_PARTITION_ADVANCED=y
132		-CONFIG_SGI_PARTITION=y
133	118	CONFIG_NLS=y
134	119	CONFIG_NLS_CODEPAGE_437=m
135	120	CONFIG_NLS_CODEPAGE_737=m
..	..	@@ -169,7 +154,6 @@
169	154	CONFIG_NLS_KOI8_R=m
170	155	CONFIG_NLS_KOI8_U=m
171	156	CONFIG_NLS_UTF8=m
172		-CONFIG_MAGIC_SYSRQ=y
173	157	CONFIG_KEYS=y
174	158	CONFIG_CRYPTO_NULL=y
175	159	CONFIG_CRYPTO_CBC=y
..	..	@@ -185,7 +169,6 @@
185	169	CONFIG_CRYPTO_SHA512=y
186	170	CONFIG_CRYPTO_TGR192=y
187	171	CONFIG_CRYPTO_WP512=y
188		-CONFIG_CRYPTO_AES=y
189	172	CONFIG_CRYPTO_ANUBIS=y
190	173	CONFIG_CRYPTO_ARC4=y
191	174	CONFIG_CRYPTO_BLOWFISH=y
..	..	@@ -199,7 +182,9 @@
199	182	CONFIG_CRYPTO_TEA=y
200	183	CONFIG_CRYPTO_TWOFISH=y
201	184	CONFIG_CRYPTO_DEFLATE=y
202		-# CONFIG_CRYPTO_ANSI_CPRNG is not set
203		-CONFIG_CRC16=y
204	185	CONFIG_CRC_T10DIF=y
205	186	CONFIG_LIBCRC32C=y
	187	+CONFIG_FONTS=y
	188	+CONFIG_FONT_8x8=y
	189	+CONFIG_FONT_8x16=y
	190	+CONFIG_MAGIC_SYSRQ=y